Sync with Tizen 3.0 setting mobile (5)

    *Fixed Application Manager - app's capacity label (4133851b08d508ad0346f0fb6b92c7298792b96f)
    *Replace SETTING_DEFAULT_CALL_TONE_SDK (e3b8f0feba38316c986f14d8564c628dbc070d61)
    *Invisible buttons fix (97f85f38c12196c5666f1e87920b63a35aeca22e)

Change-Id: Idb2ea17647b71164c84abd8386bfc13f85c3b844
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>

diff --git a/setting-appmgr/include/setting-appmgr-utils.h b/setting-appmgr/include/setting-appmgr-utils.h
index 57dea23e10c4e388939daf13ac1f5705cb12809e..295199105fc235993cff29aa02520fd306b6bb0b 100644 (file)
--- a/setting-appmgr/include/setting-appmgr-utils.h
+++ b/setting-appmgr/include/setting-appmgr-utils.h
@@ -21,6 +21,8 @@
 
 #include "setting-appmgr.h"
 
+#include <package_manager.h>
+
 enum {
        APPMGRUG_SORT_ATOZ,
        APPMGRUG_SORT_ZTOA,
@@ -34,6 +36,8 @@ void appmgrUg_get_runlistinfos_cb(int fn_result, SettingAppMgrUG *ad);
 void appmgrUg_pkgmgr_subscribe(SettingAppMgrUG *ad);
 void appmgrUg_pkgmgr_deinit(SettingAppMgrUG *ad);
 void appmgrUg_free_listinfos(SettingAppMgrUG *ad);
+Eina_Bool appmgrUg_get_app_size(void *data);
+
 void appmgrUg_size_to_str(int size, char *desc, int desc_size);
 char *appmgrUg_info_title_gl_label_get(void *data, Evas_Object *obj,
                                                                           const char *part);

diff --git a/setting-appmgr/include/setting-appmgr.h b/setting-appmgr/include/setting-appmgr.h
index aefa0aa4b068036b8021940b6e54782998536e18..1b09a649b40f02ed9511fd62b487916a368cc68c 100644 (file)
--- a/setting-appmgr/include/setting-appmgr.h
+++ b/setting-appmgr/include/setting-appmgr.h
@@ -110,6 +110,7 @@ typedef struct _appmgr_listinfo {
        bool is_disabled;
        GList *runinfos;
        GList *def_appids;
+       Ecore_Idler *size_idler;
 } appmgr_listinfo;
 
 typedef struct _appmgr_runinfo {

diff --git a/setting-appmgr/src/setting-appmgr-main.c b/setting-appmgr/src/setting-appmgr-main.c
index b705126eff69e8fa5ba88a03b624e49378cecd3c..582a8e59c89e730d6f71b94413554020357ecf6a 100644 (file)
--- a/setting-appmgr/src/setting-appmgr-main.c
+++ b/setting-appmgr/src/setting-appmgr-main.c
@@ -390,6 +390,8 @@ char *appmgrUg_main_gl_label_new_get(void *data, Evas_Object *obj, const char *p
                        label = strdup(desc);
                } else {
                        label = strdup(_(MGRAPP_STR_COMPUTING));
+                       info->size_idler = ecore_timer_add(0.6,
+                                                                                          (Ecore_Task_Cb)      appmgrUg_get_app_size, info);
                }
        }
 
@@ -423,16 +425,18 @@ Evas_Object *appmgrUg_main_gl_icon_new_get(void *data, Evas_Object *obj, const c
        retv_if(data == NULL, NULL);
 
        if (!safeStrCmp(part, "elm.swallow.icon")) {
+               icon = elm_icon_add(obj);
 
                SETTING_TRACE(" -------> info->icon_path : %s", info->icon_path);
 
                if (NULL == info->icon_path)
                        info->icon_path = appmgrUg_get_listinfo_default_icon(info->mainappid);
 
-               icon = elm_icon_add(obj);
                elm_image_file_set(icon, info->icon_path, NULL);
                elm_image_resizable_set(icon, EINA_TRUE, EINA_TRUE);
-               evas_object_size_hint_min_set(icon, SETTING_APP_MGR_ICON_SIZE, SETTING_APP_MGR_ICON_SIZE);
+
+               evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
                return icon;
        } else {

diff --git a/setting-appmgr/src/setting-appmgr-utils.c b/setting-appmgr/src/setting-appmgr-utils.c
index 7389d3dbf7754411e1b93d0fe4f7eb11b9bf7663..fc5b7d7644e11985c545d1afa25f05b19021f397 100644 (file)
--- a/setting-appmgr/src/setting-appmgr-utils.c
+++ b/setting-appmgr/src/setting-appmgr-utils.c
@@ -39,6 +39,45 @@ extern void appmgrUg_run_stop_click(void *data, Evas_Object *obj, void *event_in
 
 static void appmgrUg_free_listinfo(gpointer data);
 
+void _get_size_cb(const char *package_id, const package_size_info_h size_info, void *data)
+{
+       retm_if(data == NULL, "data == NULL");
+       appmgr_listinfo *info = data;
+
+       long long size = 0;
+       package_size_info_get_data_size(size_info, &size);
+       info->total_size = (int)size;
+
+       package_size_info_get_app_size(size_info, &size);
+       info->total_size += (int)size;
+
+       info->valid_size = true;
+       if (info->size_idler) {
+               ecore_timer_del(info->size_idler);
+               info->size_idler = NULL;
+       }
+       elm_genlist_item_fields_update(info->item, "elm.text.sub",
+                                                                  ELM_GENLIST_ITEM_FIELD_TEXT);
+}
+
+Eina_Bool appmgrUg_get_app_size(void *data)
+{
+       retvm_if(data == NULL, EINA_FALSE, "Data parameter is NULL");
+       appmgr_listinfo *info = data;
+       retv_if(info == NULL, 0);
+
+       elm_genlist_item_fields_update(info->item, "elm.text.sub",
+                                                                  ELM_GENLIST_ITEM_FIELD_TEXT);
+
+       int ret = package_manager_get_package_size_info(info->pkgid,
+                                                                                                       _get_size_cb, info);
+       if (ret != 0) {
+               SETTING_TRACE_ERROR("failed to invoke ret = %d", ret);
+       }
+
+       return EINA_FALSE;
+}
+
 void _free_GSList(GSList *list)
 {
        g_slist_foreach(list, (GFunc)g_free, NULL);
@@ -591,6 +630,13 @@ void appmgrUg_pkgmgr_subscribe(SettingAppMgrUG *ad)
                return;
        }
 
+       ret = pkgmgr_client_set_status_type(ad->pc_all_size, PKGMGR_CLIENT_STATUS_GET_SIZE);
+       if (ret < 0) {
+               SETTING_TRACE_ERROR("pkgmgr_client_set_status_type() Fail(%d)", ret);
+               pkgmgr_client_free(ad->pc_all_size);
+               ad->pc_main = NULL;
+       }
+
        ret = pkgmgr_client_listen_status(ad->pc_main, (pkgmgr_handler)appmgrUg_pkgmgr_changed_cb, ad);
        if (ret < 0) {
                SETTING_TRACE_ERROR("pkgmgr_client_listen_status() Fail(%d)", ret);
@@ -641,7 +687,6 @@ Evas_Object *appmgrUg_info_title_gl_icon_get(void *data, Evas_Object *obj,
                                                                                         const char *part)
 {
        Evas_Object *icon = NULL;
-       Evas_Object *lay = NULL;
        SettingAppMgrUG *ad = data;
 
        retv_if(data == NULL, NULL);
@@ -688,10 +733,11 @@ void appmgrUg_pkg_disable_enable_cb(void *data, Evas_Object *obj,
 void appmgrUg_pkg_stop_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
-       setting_retm_if(data == NULL, "Data parameter is NULL");
+
        SettingAppMgrUG *ad = data;
-       ret_if(NULL == ad->pkginfo);
+       setting_retm_if(ad == NULL, "Data parameter is NULL");
        appmgr_pkginfo *info = ad->pkginfo;
+       ret_if(info == NULL);
 
        GList *cur = info->appids;
        while (cur) {
@@ -730,28 +776,35 @@ Evas_Object *appmgrUg_info_2button1_gl_icon_get(void *data, Evas_Object *obj,
                                                                                                const char *part)
 {
        SETTING_TRACE_BEGIN;
-       setting_retvm_if(data == NULL, NULL, "Data parameter is NULL");
-       if (0 != safeStrCmp(part, "elm.icon"))
-               return NULL;
+
        SettingAppMgrUG *ad = data;
-       retv_if(NULL == ad->pkginfo, NULL);
-       appmgr_pkginfo *info = ad->pkginfo;
+       appmgr_pkginfo *info;
+       bool running_flag;
+       GList *cur = NULL;
+       int ret;
+       char *appid = NULL;
+       Evas_Object *box = NULL;
+       Evas_Object *button1 = NULL;
+       Evas_Object *button2 = NULL;
 
-       Evas_Object *box = elm_box_add(obj);
+       setting_retvm_if(ad == NULL, NULL, "Data parameter is NULL");
+       if (0 != safeStrCmp(part, "elm.swallow.content")) {
+               return NULL;
+       }
+       setting_retvm_if(ad->pkginfo == NULL, NULL, "ad->pkginfo is NULL");
+       info = ad->pkginfo;
+
+       box = elm_box_add(obj);
        elm_box_horizontal_set(box, 1);
        elm_box_align_set(box, 0.0, 0.5);
        elm_box_padding_set(box, 10, 0);
 
        /* Force stop button */
-       /*check if have running app */
-       bool running_flag = 0;
-       GList *cur = info->appids;
+       running_flag = false;   /* check if have running app */
+       cur = info->appids;
        while (cur) {
-               int ret;
-               char *appid = cur->data;
-
+               appid = cur->data;
                cur = cur->next;
-
                if (NULL == appid)
                        continue;
 
@@ -762,14 +815,18 @@ Evas_Object *appmgrUg_info_2button1_gl_icon_get(void *data, Evas_Object *obj,
                }
        }
 
-       Evas_Object *button1 =
-               setting_create_button(box, MGRAPP_STR_FORCE_STOP, NULL, appmgrUg_pkg_stop_cb, ad);
+       button1 = setting_create_button(box, MGRAPP_STR_FORCE_STOP,
+                                                                       NULL, appmgrUg_pkg_stop_cb, ad);
+       setting_retvm_if(!button1, NULL, "button1 is NULL");
+
        if (!running_flag)
                elm_object_disabled_set(button1, EINA_TRUE);
 
        /* Disable/Enable button */
-       Evas_Object *button2 =
-               setting_create_button(box, MGRAPP_STR_DISABLE, NULL, appmgrUg_pkg_disable_enable_cb, ad);
+       button2 = setting_create_button(box, MGRAPP_STR_DISABLE,
+                                                                       NULL, appmgrUg_pkg_disable_enable_cb, ad);
+       setting_retvm_if(!button2, NULL, "button2 is NULL");
+
        if (!info->is_support_disable) {
                elm_object_disabled_set(button2, EINA_TRUE);
        } else if (info->is_disable) {
@@ -790,24 +847,28 @@ Evas_Object *appmgrUg_info_2button2_gl_icon_get(void *data, Evas_Object *obj,
                                                                                                const char *part)
 {
        SETTING_TRACE_BEGIN;
-       setting_retvm_if(data == NULL, NULL, "Data parameter is NULL");
-       if (0 != safeStrCmp(part, "elm.icon"))
-               return NULL;
+
        SettingAppMgrUG *ad = data;
+       int ret;
+       int mmc;
+       char *btn_str = NULL;
+       appmgr_pkginfo *info = NULL;
+       const char *mmc_key = VCONFKEY_SYSMAN_MMC_STATUS;
+       Evas_Object *box = NULL;
+       Evas_Object *button1 = NULL;
+       Evas_Object *button2 = NULL;
 
-       Evas_Object *box = elm_box_add(obj);
+       setting_retvm_if(ad == NULL, NULL, "Data parameter is NULL");
+       info = ad->pkginfo;
+       setting_retvm_if(info == NULL, NULL, "ad->pkginfo is NULL");
+       if (safeStrCmp(part, "elm.swallow.content") != 0)
+               return NULL;
+
+       box = elm_box_add(obj);
        elm_box_horizontal_set(box, 1);
        elm_box_align_set(box, 0.0, 0.5);
        elm_box_padding_set(box, 8, 0);
 
-       int ret, mmc;
-       char *btn_str;
-       appmgr_pkginfo *info;
-       const char *mmc_key = VCONFKEY_SYSMAN_MMC_STATUS;
-
-       retv_if(NULL == ad->pkginfo, NULL);
-
-       info = ad->pkginfo;
 
        /* Move to */
        mmc = VCONFKEY_SYSMAN_MMC_REMOVED;
@@ -819,8 +880,8 @@ Evas_Object *appmgrUg_info_2button2_gl_icon_get(void *data, Evas_Object *obj,
        else
                btn_str = MGRAPP_STR_MOVE_TO_PHONE;
 
-       Evas_Object *button1 =
-               setting_create_button(box, btn_str, NULL, appmgrUg_pkg_moveto_cb, ad);
+       button1 = setting_create_button(box, btn_str, NULL,
+                                                                       appmgrUg_pkg_moveto_cb, ad);
 
        if (VCONFKEY_SYSMAN_MMC_MOUNTED != mmc || !info->is_movable || info->is_preload)
                elm_object_disabled_set(button1, EINA_TRUE);
@@ -831,8 +892,8 @@ Evas_Object *appmgrUg_info_2button2_gl_icon_get(void *data, Evas_Object *obj,
        else
                btn_str = MGRAPP_STR_UNINSTALL;
 
-       Evas_Object *button2 =
-               setting_create_button(box, btn_str, NULL, appmgrUg_pkg_uninstall_click, ad);
+       button2 = setting_create_button(box, btn_str, NULL,
+                                                                       appmgrUg_pkg_uninstall_click, ad);
 
        if (!info->removable)
                elm_object_disabled_set(button2, EINA_TRUE);
@@ -850,8 +911,9 @@ Evas_Object *appmgrUg_info_1button_gl_icon_get(void *data, Evas_Object *obj,
                                                                                           const char *part)
 {
        SETTING_TRACE_BEGIN;
+
        setting_retvm_if(data == NULL, NULL, "Data parameter is NULL");
-       if (0 != safeStrCmp(part, "elm.icon"))
+       if (0 != safeStrCmp(part, "elm.swallow.content"))
                return NULL;
 
        Setting_GenGroupItem_Data *item_data = data;
@@ -869,24 +931,25 @@ Evas_Object *appmgrUg_info_1button_gl_icon_get(void *data, Evas_Object *obj,
 
        info = ad->pkginfo;
 
-       Evas_Object *button1 =
-               setting_create_button(box, "BLANK", NULL, NULL, NULL);
-
-       evas_object_hide(button1);
-
        /* Clear cache */
-
-       Evas_Object *button2 =
-               setting_create_button(box, MGRAPP_STR_CLEAR_CACHE, NULL, appmgrUg_pkg_clear_cache_click, ad);
+       Evas_Object *button1 = setting_create_button(box,
+                                                                                                MGRAPP_STR_CLEAR_CACHE, NULL,
+                                                                                                appmgrUg_pkg_clear_cache_click, ad);
 
        if (info->sz_cache <= 0) {
-               elm_object_disabled_set(button2, EINA_TRUE);
+               elm_object_disabled_set(button1, EINA_TRUE);
        }
+
+       /* Fake button to reserve space after button1 */
+       Evas_Object *button2 = setting_create_button(box, "BLANK", NULL, NULL,
+                                                                                                NULL);
+       evas_object_hide(button2);
+
        elm_box_pack_end(box, button1);
        elm_box_pack_end(box, button2);
 
        /*evas_object_show(button1); */
-       evas_object_show(button2);
+       evas_object_show(button1);
        evas_object_show(box);
 
        SETTING_TRACE_END;

diff --git a/setting-appmgr/src/setting-appmgr.c b/setting-appmgr/src/setting-appmgr.c
index 8a88571a3e79fdd441de95d9350ccfdd6f0541fa..1aa4e7e064b3ed726430ae1a61eb0cc4feabd43b 100644 (file)
--- a/setting-appmgr/src/setting-appmgr.c
+++ b/setting-appmgr/src/setting-appmgr.c
@@ -77,7 +77,7 @@ static inline void appmgrUg_init_itcs(SettingAppMgrUG *ad)
        ad->itc_main.func.state_get = NULL;
        ad->itc_main.func.del = _main_gl_del_cb;
 
-       ad->itc_1ic.item_style = "1icon";
+       ad->itc_1ic.item_style = SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE;
        ad->itc_1ic.func.text_get = NULL;
        ad->itc_1ic.func.content_get = appmgrUg_run_gl_stop_btn;
        ad->itc_1ic.func.state_get = NULL;
@@ -89,19 +89,19 @@ static inline void appmgrUg_init_itcs(SettingAppMgrUG *ad)
        ad->itc_info_title.func.state_get = NULL;
        ad->itc_info_title.func.del = NULL;
 
-       ad->itc_2button1.item_style = "1icon";
+       ad->itc_2button1.item_style = SETTING_GENLIST_1ICON_STYLE;
        ad->itc_2button1.func.text_get = NULL;
        ad->itc_2button1.func.content_get = appmgrUg_info_2button1_gl_icon_get;
        ad->itc_2button1.func.state_get = NULL;
        ad->itc_2button1.func.del = NULL;
 
-       ad->itc_2button2.item_style = "1icon";
+       ad->itc_2button2.item_style = SETTING_GENLIST_1ICON_STYLE;
        ad->itc_2button2.func.text_get = NULL;
        ad->itc_2button2.func.content_get = appmgrUg_info_2button2_gl_icon_get;
        ad->itc_2button2.func.state_get = NULL;
        ad->itc_2button2.func.del = NULL;
 
-       setting_create_Gendial_itc("1icon", &(ad->itc_1button));
+       setting_create_Gendial_itc(SETTING_GENLIST_1ICON_STYLE, &(ad->itc_1button));
        ad->itc_1button.func.text_get = NULL;
        ad->itc_1button.func.content_get = appmgrUg_info_1button_gl_icon_get;
        ad->itc_1button.func.del = NULL;

diff --git a/setting-common/include/setting-common-data-type.h b/setting-common/include/setting-common-data-type.h
index 73ed81f9814ee6547a1ba44349a540fe061316e3..eaa1209d140a61a952ed092167bce396bbfa05e3 100644 (file)
--- a/setting-common/include/setting-common-data-type.h
+++ b/setting-common/include/setting-common-data-type.h
@@ -43,7 +43,7 @@
 #endif
 #define PWD_FILE       _TZ_SYS_DATA"/setting/set_info"
 
-
+#define SETTING_GENLIST_1ICON_STYLE                    "full"
 #define SETTING_GENLIST_GROUP_INDEX_STYLE "group_index"
 #define SETTING_GENLIST_ICON_1LINE_STYLE "type1"
 #define SETTING_GENLIST_2LINE_STYLE "type1"

diff --git a/setting-common/include/setting-common-string.h b/setting-common/include/setting-common-string.h
index d2b1871f3e28297258b7419886bb374cfdc47e3e..bcfaa2b14caf13729623449f541bfa88e2f115de 100644 (file)
--- a/setting-common/include/setting-common-string.h
+++ b/setting-common/include/setting-common-string.h
@@ -43,11 +43,11 @@
 #define SETTING_OPEN_SOURCE_LICENSE_PATH       "file:///usr/share/license.html"
 
 #define SETTING_OTHER_UG_ICON_PATH                     _TZ_SYS_RO_ICONS"/default/small/"
-#define SETTING_DEFAULT_CALL_TONE                      _TZ_SYS_SHARE"/settings/Ringtones/Over_the_horizon.ogg"
-#define SETTING_DEFAULT_CALL_TONE_SDK  _TZ_SYS_SHARE"/settings/Ringtones/Over_the_horizon.ogg"
+#define SETTING_DEFAULT_CALL_TONE                      _TZ_SYS_SHARE"/settings/Ringtones/ringtone_sdk.mp3"
+#define SETTING_DEFAULT_CALL_TONE_SDK          _TZ_SYS_SHARE"/settings/Ringtones/ringtone_sdk.mp3"
 #define SETTING_DEFAULT_CALL_VIB                       _TZ_SYS_SHARE"/settings/Vibrations/haptic/default/Ticktock.ivt"
-#define DEF_RINGTONE                                           _TZ_SYS_SHARE"/settings/Ringtones/Over_the_horizon.ogg"
-#define SETTING_MMC_PATH                               _TZ_SYS_MEDIA"/sdcard/"
+#define DEF_RINGTONE                                           _TZ_SYS_SHARE"/settings/Ringtones/ringtone_sdk.mp3"
+#define SETTING_MMC_PATH                                       _TZ_SYS_MEDIA"/sdcard/"
 
 /***************new V7.0*************/
 #define KeyStr_Emulator                                        "Emulator" /* be used to compare with model_str from system_info_get_platform_string(SYSTEM_INFO_KEY_MODEL, &model_str) */

diff --git a/setting-common/src/setting-common-draw-genlist.c b/setting-common/src/setting-common-draw-genlist.c
index ed6335540943051e0a67c3a66a534038fcc6d01d..77ebbfee3faa2cc7204b76a38a857f823445ae55 100644 (file)
--- a/setting-common/src/setting-common-draw-genlist.c
+++ b/setting-common/src/setting-common-draw-genlist.c
@@ -58,9 +58,9 @@ DEFINE_ITC1(SETTING_GENLIST_ICON_1LINE_STYLE, itc_cm_1text_1icon_2);
 DEFINE_ITC1(SETTING_GENLIST_ICON_1LINE_STYLE, itc_1text_1icon_divider);
 DEFINE_ITC1(SETTING_GENLIST_ICON_1LINE_STYLE, itc_multiline_1text_1icon);
 
-DEFINE_ITC1("1icon", itc_bg_1icon);
-DEFINE_ITC1("1icon", itc_1icon_with_no_line);
-DEFINE_ITC1("1icon", itc_1icon);
+DEFINE_ITC1(SETTING_GENLIST_1ICON_STYLE, itc_bg_1icon);
+DEFINE_ITC1(SETTING_GENLIST_1ICON_STYLE, itc_1icon_with_no_line);
+DEFINE_ITC1(SETTING_GENLIST_1ICON_STYLE, itc_1icon);
 
 DEFINE_ITC1("1text", itc_normal_1text);
 

diff --git a/setting-common/src/setting-common-search.c b/setting-common/src/setting-common-search.c
index a751b4a426114d42e8c832036f8dcd5c99631df2..7eb49e2e2dde4c7cfaafb9fe4b87197237a4392d 100644 (file)
--- a/setting-common/src/setting-common-search.c
+++ b/setting-common/src/setting-common-search.c
@@ -45,7 +45,7 @@ static Evas_Object *__no_result_icon_get(void *data, Evas_Object *obj, const cha
 
 EXPORT_PUBLIC
 const Elm_Genlist_Item_Class itc_no_reult = {
-       .item_style = "1icon/with_no_line",
+       .item_style = SETTING_GENLIST_1ICON_STYLE,
        .func.text_get = NULL,
        .func.content_get = __no_result_icon_get,
        .func.state_get = NULL,
@@ -159,7 +159,7 @@ static Evas_Object *__no_result_icon_get(void *data, Evas_Object *obj, const cha
        SETTING_TRACE_BEGIN;
        setting_retvm_if(!data || !obj, NULL, "!data || !obj");
 
-       if (!safeStrCmp(part, "elm.icon")) {
+       if (!safeStrCmp(part, "elm.swallow.content")) {
                Evas_Object *box = elm_box_add(obj);
 
                int rot = elm_win_rotation_get(obj);

diff --git a/setting-font/src/setting-font-main.c b/setting-font/src/setting-font-main.c
index 0f03c79c01eecf6ad1fe6c15bb99ac84ec5d3105..6999926d2f56dbc6fd5655d5980e204bf068bdc0 100644 (file)
--- a/setting-font/src/setting-font-main.c
+++ b/setting-font/src/setting-font-main.c
@@ -836,8 +836,8 @@ static int setting_font_main_create(void *cb)
        setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE, &(ad->itc_1text_1icon_2));
        ad->itc_1text_1icon_2.func.text_get = _item_text_keystr2_get;
 
-       setting_create_Gendial_itc("full", &(ad->itc_bg_1icon));
-       setting_create_Gendial_itc("type1", &(ad->itc_1icon));
+       setting_create_Gendial_itc(SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE, &(ad->itc_bg_1icon));
+       setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE, &(ad->itc_1icon));
        SETTING_TRACE("ad->itc_bg_1icon: %s ", ad->itc_bg_1icon);
        ad->itc_bg_1icon.func.content_get = _font_size_slider_get;
 

diff --git a/setting-font/src/setting-font.c b/setting-font/src/setting-font.c
index 9acd4787f64982e1c13e543274bbfab0948ed91e..88dcb521b4cb5f26dd74719cd91d0adff2334364 100644 (file)
--- a/setting-font/src/setting-font.c
+++ b/setting-font/src/setting-font.c
@@ -179,7 +179,7 @@ static void *setting_font_ug_on_create(ui_gadget_h ug, enum ug_mode mode,
        /*setting_create_Gendial_itc("dialogue/2text.3", &(fontUG->itc_2text_2)); */
        setting_create_Gendial_itc(SETTING_GENLIST_2LINE_STYLE, &(fontUG->itc_2text_2));
        setting_create_Gendial_itc(SETTING_GENLIST_GROUP_INDEX_STYLE, &(fontUG->itc_group_item));
-       setting_create_Gendial_itc("1icon", &(fontUG->itc_1icon));
+       setting_create_Gendial_itc(SETTING_GENLIST_1ICON_STYLE, &(fontUG->itc_1icon));
 
        /* view type checking */
        fontUG->view_to_load = __get_font_view_to_load(fontUG, service);

diff --git a/setting-phone/src/setting-phone-region-format.c b/setting-phone/src/setting-phone-region-format.c
index 51ecce913833a5ff79626856cfd27afdacc855f5..77412b97a326b3521e47a910d6e5666ae59214cc 100644 (file)
--- a/setting-phone/src/setting-phone-region-format.c
+++ b/setting-phone/src/setting-phone-region-format.c
@@ -949,7 +949,7 @@ static Evas_Object *_item_content_get(void *data, Evas_Object *obj, const char *
        SETTING_TRACE_BEGIN;
        setting_retvm_if(!data || !obj, NULL, "!data || !obj");
 
-       if (!safeStrCmp(part, "elm.icon")) {
+       if (!safeStrCmp(part, "elm.swallow.content")) {
                Evas_Object *sub_layout = elm_layout_add(obj);
                elm_layout_theme_set(sub_layout, "layout", "nocontents", "search");
                evas_object_size_hint_weight_set(sub_layout, EVAS_HINT_EXPAND, 0);
@@ -1041,7 +1041,7 @@ static int setting_phone_region_format_create(void *cb)
        }
 
        /* */
-       setting_create_Gendial_itc("1icon", &(ad->itc_1icon_with_no_line));
+       setting_create_Gendial_itc(SETTING_GENLIST_1ICON_STYLE, &(ad->itc_1icon_with_no_line));
        ad->itc_1icon_with_no_line.func.content_get = _item_content_get;
 
        Elm_Object_Item *navi_it = setting_push_layout_navi_bar(REGION_FORMAT_LOWER,

diff --git a/setting-profile/include/setting-profile.h b/setting-profile/include/setting-profile.h
index 1747b503fd5c654f9c9cbd304226d377ed38f8b7..998c13fd2446be3ddffa0188d3629e03d370abe0 100644 (file)
--- a/setting-profile/include/setting-profile.h
+++ b/setting-profile/include/setting-profile.h
@@ -34,11 +34,10 @@
 #define VOLUME_APP_NAME "org.tizen.setting.volume"
 #define MAX_SAFETY_VOLUME_LEVEL 10
 #define SETTING_PROFILE_SOUND_ALERTS_PATH      _TZ_SYS_SHARE"/settings/Alerts"
-/*#define SETTING_PROFILE_SOUND_RINGTONES_PATH   _TZ_SYS_SHARE"/settings/Ringtones" */
-#define SETTING_PROFILE_SOUND_RINGTONES_PATH   "/usr/apps/org.tizen.setting/shared/res/settings/Ringtones"
+#define SETTING_PROFILE_SOUND_RINGTONES_PATH   _TZ_SYS_SHARE"/settings/Ringtones"
 #define SETTING_PROFILE_MMC_PATH               _TZ_SYS_MEDIA"/sdcard"
 #define SETTING_DEFAULT_MSG_TONE               _TZ_SYS_SHARE"/settings/Alerts/Whistle.ogg"
-#define SETTING_DEFAULT_MEDIA_TONE             _TZ_SYS_SHARE"/settings/Previews/Media_preview_Over_the_horizon.ogg"
+#define SETTING_DEFAULT_MEDIA_TONE             _TZ_SYS_SHARE"/settings/Ringtones/ringtone_sdk.mp3"
 #define SUPPORT_PLAYER_ASYNC 1
 
 /*Call ringtone:3 icon status */

diff --git a/setting-ringtone/src/setting-ringtone-main.c b/setting-ringtone/src/setting-ringtone-main.c
index 3cb2fe568c92ef86f25189587690dc8c1e876c51..e86ada0d6e7f0179cf4aaffd0cc9af0c20e19e49 100644 (file)
--- a/setting-ringtone/src/setting-ringtone-main.c
+++ b/setting-ringtone/src/setting-ringtone-main.c
@@ -137,7 +137,7 @@ static void _ringtone_gl_del(void *data, Evas_Object *obj)
 static inline void appmgrUg_init_itcs(SettingRingtoneUG *ad)
 {
        SETTING_TRACE_BEGIN;
-       ad->itc_ring.item_style = "type1";
+       ad->itc_ring.item_style = SETTING_GENLIST_ICON_1LINE_STYLE;
        ad->itc_ring.func.text_get = _ringtone_gl_label_get;
        ad->itc_ring.func.content_get = _ringtone_gl_icon_get;
        ad->itc_ring.func.state_get = NULL;