Ringtone module

- Default ringtone/notification sounds updated to reflect those from vconf keys
- "is_default" appctl out param would have incorrect value if user had not clicked any item

Change-Id: Ie90875fb56a04981edb67cd4b7fc19d7a4d86ac5
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/setting-ringtone/include/setting-ringtone.h b/setting-ringtone/include/setting-ringtone.h
index 89eaeef9c8375cab74d615d717ad8a21cbffb622..3c7d9c2cc29a9ae4ee9b610c16c73acb72b8ba16 100644 (file)
--- a/setting-ringtone/include/setting-ringtone.h
+++ b/setting-ringtone/include/setting-ringtone.h
@@ -39,8 +39,9 @@
 #define ALERT_DIR_PATH         _TZ_SYS_SHARE"/settings/Alerts"
 #define ALERT_DIR_PATH_1       _TZ_SYS_SHARE"/settings/Alerts/"
 #define RINGTONE_FILE_PATH_DEF _TZ_SYS_SHARE\
-                               "/settings/Ringtones/Over_the_horizon.ogg"
-#define ALERT_FILE_PATH_DEF    _TZ_SYS_SHARE"/settings/Alerts/Beep_Once.ogg"
+                               "/settings/Ringtones/ringtone_sdk.mp3"
+#define ALERT_FILE_PATH_DEF    _TZ_SYS_SHARE\
+                               "/settings/Alerts/General notification_sdk.wav"
 
 /**
  * SettingRingtoneData contains module specific runtime data.

diff --git a/setting-ringtone/src/setting-ringtone-main.c b/setting-ringtone/src/setting-ringtone-main.c
index 0a1c41a9257fffe60e4cdd5d26400ebe848397b0..341317edde8ac3bb0f4eec655dbf188820f1743f 100755 (executable)
--- a/setting-ringtone/src/setting-ringtone-main.c
+++ b/setting-ringtone/src/setting-ringtone-main.c
@@ -28,8 +28,6 @@
 #include <system_settings.h>
 #include <call-manager.h>
 
-#define RINGTONE_SELECTED_IS_DEFAULT_KEY       "is_default"
-
 static int setting_ringtone_create(void *cb);
 static int setting_ringtone_destroy(void *cb);
 static int setting_ringtone_update(void *cb);
@@ -212,8 +210,9 @@ static void _done_click_cb(void *data, Evas_Object *obj,
        app_control_add_extra_data_array(ad->md.app_reply_svc,
                        APP_CONTROL_DATA_SELECTED, selected_file,
                        sizeof(selected_file)/sizeof(const char *));
+       /* External app needs to know if default item has been selected: */
        app_control_add_extra_data(ad->md.app_reply_svc,
-                       RINGTONE_SELECTED_IS_DEFAULT_KEY,
+                       "is_default",
                        (ad->selected_item_data == ad->default_item_data) ?
                                        "true" : "false");
        ui_app_exit();
@@ -631,7 +630,6 @@ static void _create_main_ui_list(SettingRingtoneData *ad)
        fileNodeInfo *lnode_data = NULL;
        char *default_file_path = NULL;
        char *full_path = NULL;
-       Elm_Object_Item *cur_item = NULL;
        Setting_GenGroupItem_Data *item_data = NULL;
        int cnt = 0;
        int cur_pos = -1; /*current selected item */
@@ -657,7 +655,7 @@ static void _create_main_ui_list(SettingRingtoneData *ad)
                        ad->default_item_data = item_data;
                }
                cur_pos = cnt;
-               cur_item = item_data->item;
+               ad->selected_item_data = item_data;
                cnt++;
        }
 
@@ -694,7 +692,7 @@ static void _create_main_ui_list(SettingRingtoneData *ad)
 
                if (!safeStrCmp(full_path, ad->appctl_file_path)) {
                        cur_pos = cnt;
-                       cur_item = item_data->item;
+                       ad->selected_item_data = item_data;
                        free(ad->selected_file_path);
                        ad->selected_file_path = strdup(full_path);
                }
@@ -702,7 +700,9 @@ static void _create_main_ui_list(SettingRingtoneData *ad)
        }
 
        elm_radio_value_set(ad->common_radio_group, cur_pos);
-       elm_genlist_item_bring_in(cur_item, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE);
+       if (ad->selected_item_data)
+               elm_genlist_item_bring_in(ad->selected_item_data->item,
+                                       ELM_GENLIST_ITEM_SCROLLTO_MIDDLE);
 
        free(default_file_path);
 }

diff --git a/setting-ringtone/src/setting-ringtone-util.c b/setting-ringtone/src/setting-ringtone-util.c
index 31c09074031ec9c6e99d1d7edcce89cf06df6e8a..ca07c6ecdee098bd817af4a0e98dbdcbe8b2dea2 100644 (file)
--- a/setting-ringtone/src/setting-ringtone-util.c
+++ b/setting-ringtone/src/setting-ringtone-util.c
@@ -83,7 +83,7 @@ int get_filelist_from_dir_path(char *path, Eina_List **file_list)
                if ((ent.d_type & DT_REG) == 0)
                        continue;
 
-               pNode = (fileNodeInfo *) malloc(sizeof(fileNodeInfo));
+               pNode = (fileNodeInfo *)malloc(sizeof(fileNodeInfo));
                if (pNode == NULL)
                        continue;