Add API for get/set default highlight button

Signed-off-by: seungha.son <seungha.son@samsung.com>
Change-Id: If13602041791ba173a7cadd6af72885b2833eff6

diff --git a/include/notification_internal.h b/include/notification_internal.h
index a97c2b6408e7ac5ac82af271ead69f41227f96b5..5df7184c74040b4f22eeb35794773460220edee3 100644 (file)
--- a/include/notification_internal.h
+++ b/include/notification_internal.h
@@ -725,6 +725,82 @@ int notification_unregister_detailed_changed_cb_for_uid(
                void (*detailed_changed_cb)(void *data, notification_type_e type, notification_op *op_list, int num_op),
                void *user_data, uid_t uid);
 
+/**
+ * @brief Sets the default button to display highlight on the notification.
+ * @since_tizen 3.0
+ * @remarks If you want to default button is off, you set that index is zero
+ * @param[in] noti       The notification handle
+ * @param[in] index      The notification button index
+ * @return #NOTIFICATION_ERROR_NONE on success,
+ *         otherwise any other value on failure
+ * @retval #NOTIFICATION_ERROR_NONE         Success
+ * @retval #NOTIFICATION_ERROR_INVALID_PARAMETER Invalid parameter
+ * @pre Notification handle should be created by notification_create().
+ * @see #notification_button_index_e
+ * @par Sample code:
+ * @code
+#include <notification.h>
+...
+{
+       notification_h noti = NULL;
+       int noti_err = NOTIFICATION_ERROR_NONE;
+
+       noti = notification_create(NOTIFICATION_TYPE_NOTI);
+       if(noti == NULL) {
+               return;
+       }
+
+       noti_err  = notification_set_default_button(noti, NOTIFICATION_BUTTON_1);
+       if(noti_err != NOTIFICATION_ERROR_NONE) {
+               notification_free(noti);
+               return;
+       }
+
+       ...
+
+}
+ * @endcode
+ */
+int notification_set_default_button(notification_h noti, notification_button_index_e index);
+
+/**
+ * @brief Gets the default button to display highlight on the notification.
+ * @since_tizen 3.0
+ * @param[in] noti       The notification handle
+ * @param[out] index     The notification button index
+ * @return #NOTIFICATION_ERROR_NONE on success,
+ *         otherwise any other value on failure
+ * @retval #NOTIFICATION_ERROR_NONE         Success
+ * @retval #NOTIFICATION_ERROR_INVALID_PARAMETER Invalid parameter
+ * @pre Notification handle should be created by notification_create().
+ * @see #notification_button_index_e
+ * @par Sample code:
+ * @code
+#include <notification.h>
+...
+{
+       notification_h noti = NULL;
+       notification_button_index_e index;
+       int noti_err = NOTIFICATION_ERROR_NONE;
+
+       noti = notification_create(NOTIFICATION_TYPE_NOTI);
+       if(noti == NULL) {
+               return;
+       }
+
+       noti_err  = notification_set_default_button(noti, &index);
+       if(noti_err != NOTIFICATION_ERROR_NONE) {
+               notification_free(noti);
+               return;
+       }
+
+       ...
+
+}
+ * @endcode
+ */
+int notification_get_default_button(notification_h noti, notification_button_index_e *index);
+
 /**
  * @brief This function translate localized texts
  * @param[in] noti The notification handle that is created by notification_create()

diff --git a/include/notification_private.h b/include/notification_private.h
index d9a7167ebad0204d721f78ee2bb38175a8af57db..a2e6ecefb6ac03050e2659bfa7d6f42aae8cbec7 100644 (file)
--- a/include/notification_private.h
+++ b/include/notification_private.h
@@ -89,6 +89,7 @@ struct _notification {
        char *tag;
        bool ongoing_flag;
        bool auto_remove;
+       notification_button_index_e default_button_index;
        uid_t uid;
 };
 
@@ -142,6 +143,7 @@ typedef enum notification_data_type {
        NOTIFICATION_DATA_TYPE_TAG,
        NOTIFICATION_DATA_TYPE_ONGOING_FLAG,
        NOTIFICATION_DATA_TYPE_AUTO_REMOVE,
+       NOTIFICATION_DATA_TYPE_DEFAULT_BUTTON,
        NOTIFICATION_DATA_TYPE_UID,
 } notification_data_type_e;
 

diff --git a/src/notification.c b/src/notification.c
index 480fc1926ca5c7c94924870d7d7abfc676d13d4e..3ab618e8362a9d60284eb9c558d3181ff02cb3fe 100755 (executable)
--- a/src/notification.c
+++ b/src/notification.c
@@ -1428,6 +1428,7 @@ static notification_h _notification_create(notification_type_e type)
        noti->display_applist = NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY | NOTIFICATION_DISPLAY_APP_TICKER | NOTIFICATION_DISPLAY_APP_INDICATOR;
        noti->auto_remove = true;
        noti->ongoing_flag = false;
+       noti->default_button_index = 0;
 
        if (getuid() >= REGULAR_UID_MIN) {
                noti->caller_pkgname = notification_get_pkgname_by_pid();
@@ -1638,6 +1639,7 @@ EXPORT_API int notification_clone(notification_h noti, notification_h *clone)
 
        new_noti->ongoing_flag = noti->ongoing_flag;
        new_noti->auto_remove = noti->auto_remove;
+       new_noti->default_button_index = noti->default_button_index;
        new_noti->uid = noti->uid;
 
        new_noti->app_icon_path = NULL;

diff --git a/src/notification_db.c b/src/notification_db.c
index 156ad78e39cfc299b637f0afa17f693f357385a9..b4cfaf03d14ccea99777c6717d05188cb9cedf46 100755 (executable)
--- a/src/notification_db.c
+++ b/src/notification_db.c
@@ -80,6 +80,7 @@ create        table if not exists noti_list ( \
                        progress_percentage DOUBLE default 0, \
                        ongoing_flag INTEGER default 0, \
                        auto_remove INTEGER default 1, \
+                       default_button_index INTEGER default 0, \
                        uid INTEGER \
                ); \
                create table if not exists noti_group_data ( \
@@ -189,6 +190,7 @@ create      table if not exists noti_list ( \
                        progress_percentage DOUBLE default 0, \
                        ongoing_flag INTEGER default 0, \
                        auto_remove INTEGER default 1, \
+                       default_button_index INTEGER default 0, \
                        uid INTEGER, \
                        template_name TEXT, \
                        UNIQUE (caller_pkgname, template_name) \

diff --git a/src/notification_internal.c b/src/notification_internal.c
index 337066b5e47e9b804571d2dfb68b723631329d19..dbf3820929f8c6a3a459465a1f83a65d1ecdb484 100755 (executable)
--- a/src/notification_internal.c
+++ b/src/notification_internal.c
@@ -1310,3 +1310,26 @@ EXPORT_API notification_h notification_create_from_package_template(const char *
 
        return noti;
 }
+
+int notification_set_default_button(notification_h noti, notification_button_index_e index)
+{
+       if (noti == NULL)
+               return NOTIFICATION_ERROR_INVALID_PARAMETER;
+
+       if (index < 0 && index > NOTIFICATION_BUTTON_6)
+               return NOTIFICATION_ERROR_INVALID_PARAMETER;
+
+       noti->default_button_index = index;
+
+       return NOTIFICATION_ERROR_NONE;
+}
+
+int notification_get_default_button(notification_h noti, notification_button_index_e *index)
+{
+       if (noti == NULL || index == NULL)
+               return NOTIFICATION_ERROR_INVALID_PARAMETER;
+
+       *index = noti->default_button_index;
+
+       return NOTIFICATION_ERROR_NONE;
+}

diff --git a/src/notification_ipc.c b/src/notification_ipc.c
index 940ce706e8e6a18cc715bbd0958a1f3bfb5a80c7..0453d57c70dafc719de2af2c57ee7e529422b4d6 100755 (executable)
--- a/src/notification_ipc.c
+++ b/src/notification_ipc.c
@@ -1664,8 +1664,8 @@ EXPORT_API GVariant *notification_ipc_make_gvariant_from_noti(notification_h not
                g_variant_builder_add(&builder, "{iv}", NOTIFICATION_DATA_TYPE_TAG, g_variant_new_string((const gchar *)noti->tag));
 
        g_variant_builder_add(&builder, "{iv}", NOTIFICATION_DATA_TYPE_ONGOING_FLAG, g_variant_new_int32(noti->ongoing_flag));
-
        g_variant_builder_add(&builder, "{iv}", NOTIFICATION_DATA_TYPE_AUTO_REMOVE, g_variant_new_int32(noti->auto_remove));
+       g_variant_builder_add(&builder, "{iv}", NOTIFICATION_DATA_TYPE_DEFAULT_BUTTON, g_variant_new_int32(noti->default_button_index));
        g_variant_builder_add(&builder, "{iv}", NOTIFICATION_DATA_TYPE_UID, g_variant_new_int32(noti->uid));
 
        result_body = g_variant_builder_end(&builder);
@@ -1813,6 +1813,7 @@ EXPORT_API int notification_ipc_make_noti_from_gvariant(notification_h noti,
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_TAG, "&s", &tag);
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_ONGOING_FLAG, "i", &noti->ongoing_flag);
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_AUTO_REMOVE, "i", &noti->auto_remove);
+       _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_DEFAULT_BUTTON, "i", &noti->default_button_index);
        _variant_dict_lookup(dict, NOTIFICATION_DATA_TYPE_UID, "i", &noti->uid);
 
        noti->caller_pkgname = _dup_string(caller_pkgname);

diff --git a/src/notification_noti.c b/src/notification_noti.c
index 31ea5587a6d79010d9dffbd0c49e7796e8e6b00b..144382227644fe3392d8b88006194cf8eb4ad130 100755 (executable)
--- a/src/notification_noti.c
+++ b/src/notification_noti.c
@@ -261,7 +261,7 @@ static int _insertion_query_create(notification_h noti, char **query)
                "b_event_handler_click_on_icon, b_event_handler_click_on_thumbnail, "
                "sound_type, sound_path, vibration_type, vibration_path, led_operation, led_argb, led_on_ms, led_off_ms, "
                "flags_for_property, flag_simmode, display_applist, "
-               "progress_size, progress_percentage, ongoing_flag, auto_remove, uid) values ("
+               "progress_size, progress_percentage, ongoing_flag, auto_remove, default_button_index, uid) values ("
                "%d, "
                "%d, "
                "'%s', '%s', "
@@ -279,7 +279,7 @@ static int _insertion_query_create(notification_h noti, char **query)
                "'%s', '%s', "
                "%d, '%s', %d, '%s', %d, %d, %d, %d,"
                "%d, %d, %d, "
-               "$progress_size, $progress_percentage, %d, %d, %d)",
+               "$progress_size, $progress_percentage, %d, %d, %d, %d)",
                noti->type,
                noti->layout,
                NOTIFICATION_CHECK_STR(noti->caller_pkgname),
@@ -314,6 +314,7 @@ static int _insertion_query_create(notification_h noti, char **query)
                noti->flags_for_property, flag_simmode, noti->display_applist,
                noti->ongoing_flag,
                noti->auto_remove,
+               noti->default_button_index,
                noti->uid);
 
        /* Free decoded data */
@@ -450,7 +451,7 @@ static int _update_query_create(notification_h noti, char **query)
                "flags_for_property = %d, flag_simmode = %d, "
                "display_applist = %d, "
                "progress_size = $progress_size, progress_percentage = $progress_percentage, "
-               "ongoing_flag = %d, auto_remove = %d "
+               "ongoing_flag = %d, auto_remove = %d, default_button_index = %d "
                "where priv_id = %d ",
                noti->type,
                noti->layout,
@@ -482,7 +483,7 @@ static int _update_query_create(notification_h noti, char **query)
                noti->led_on_ms,
                noti->led_off_ms,
                noti->flags_for_property, flag_simmode, noti->display_applist,
-               noti->ongoing_flag, noti->auto_remove,
+               noti->ongoing_flag, noti->auto_remove, noti->default_button_index,
                noti->priv_id);
 
        /* Free decoded data */
@@ -579,6 +580,7 @@ static void _notification_noti_populate_from_stmt(sqlite3_stmt *stmt, notificati
 
        noti->ongoing_flag = sqlite3_column_int(stmt, col++);
        noti->auto_remove = sqlite3_column_int(stmt, col++);
+       noti->default_button_index = sqlite3_column_int(stmt, col++);
 
        noti->app_icon_path = NULL;
        noti->app_name = NULL;