Merge "fixed icon prefix of path (com.samsung --> org.tizen)" into 2.0_beta

diff --git a/resource/setting.cfg b/resource/setting.cfg
index 441b19a..f062934 100755 (executable)
--- a/resource/setting.cfg
+++ b/resource/setting.cfg
@@ -214,7 +214,7 @@
     "menu" : [
       {
         "key_name" : "IDS_COM_BODY_CALL",
-        "icon_path" : "/usr/share/icons/default/small/com.samsung.phone.png",
+        "icon_path" : "/usr/share/icons/default/small/org.tizen.phone.png",
         "ug_args" : "setting-call-efl",
         "pos" : 0,
         "click_times" : 0,
@@ -222,7 +222,7 @@
       },
       {
         "key_name" : "IDS_COM_BODY_MESSAGES",
-        "icon_path" : "/opt/share/icons/default/small/com.samsung.message.png",
+        "icon_path" : "/opt/share/icons/default/small/org.tizen.message.png",
         "ug_args" : "msg-setting-efl",
         "pos" : 0,
         "click_times" : 0,
@@ -230,7 +230,7 @@
       },
       {
         "key_name" : "IDS_COM_BODY_EMAIL",
-        "icon_path" : "/opt/share/icons/default/small/com.samsung.email.png",
+        "icon_path" : "/opt/share/icons/default/small/org.tizen.email.png",
         "ug_args" : "email-setting-efl|VIEW_TYPE:main-view",
         "pos" : 0,
         "click_times" : 0,
@@ -238,7 +238,7 @@
       },
       {
         "key_name" : "IDS_COM_BODY_CONTACTS",
-        "icon_path" : "/usr/share/icons/default/small/com.samsung.contacts.png",
+        "icon_path" : "/usr/share/icons/default/small/org.tizen.contacts.png",
         "ug_args" : "contacts-settings-efl|request_type:71",
         "pos" : 0,
         "click_times" : 0,
@@ -246,7 +246,7 @@
       },
       {
         "key_name" : "IDS_COM_BODY_CALENDAR",
-        "icon_path" : "/opt/share/icons/default/small/com.samsung.calendar.png",
+        "icon_path" : "/opt/share/icons/default/small/org.tizen.calendar.png",
         "ug_args" : "calendar-settings-efl",
         "pos" : 0,
         "click_times" : 0,
@@ -254,19 +254,11 @@
       },
       {
         "key_name" : "IDS_COM_BODY_GALLERY",
-        "icon_path" : "/opt/share/icons/default/small/com.samsung.gallery.png",
+        "icon_path" : "/opt/share/icons/default/small/org.tizen.gallery.png",
         "ug_args" : "setting-gallery-efl",
         "pos" : 0,
         "click_times" : 0,
         "is_resetable" : 0
-      },
-      {
-        "key_name" : "IDS_COM_BODY_VOICE_RECORDER",
-        "icon_path" : "/opt/share/icons/default/small/com.samsung.voicerecorder.png",
-        "ug_args" : "setting-voicerecorder-efl",
-        "pos" : 0,
-        "click_times" : 0,
-        "is_resetable" : 0
       }
     ]
   },

diff --git a/setting-common/include/setting-common-resource.h b/setting-common/include/setting-common-resource.h
index 034beb0..2d576b6 100755 (executable)
--- a/setting-common/include/setting-common-resource.h
+++ b/setting-common/include/setting-common-resource.h
@@ -185,15 +185,15 @@
 /* #define IMG_MenuWidgets     SETTING_ICON_PATH_CFG"Menu and widgets"*/
 
 /* applications IMG*/
-#define IMG_Call       "/usr/share/icons/default/small/com.samsung.phone.png"
-#define IMG_Messages "/opt/share/icons/default/small/com.samsung.message.png"
-#define IMG_Email      "/opt/share/icons/default/small/com.samsung.email.png"
-#define IMG_Contacts   "/usr/share/icons/default/small/com.samsung.contacts.png"
-#define IMG_Calendar   "/opt/share/icons/default/small/com.samsung.calendar.png"
-#define IMG_Gallery            "/opt/share/icons/default/small/com.samsung.gallery.png"
-#define IMG_VoiceRecorder      "/opt/share/icons/default/small/com.samsung.voicerecorder.png"
-#define IMG_NFC                "/opt/ug/res/icons/ug-setting-nfc-efl/com.samsung.nfc-app.png"
-#define IMG_DataUsage          SETTING_ICON_PATH_CFG"com.samsung.traf-control.png"
+#define IMG_Call       "/usr/share/icons/default/small/org.tizen.phone.png"
+#define IMG_Messages "/opt/share/icons/default/small/org.tizen.message.png"
+#define IMG_Email      "/opt/share/icons/default/small/org.tizen.email.png"
+#define IMG_Contacts   "/usr/share/icons/default/small/org.tizen.contacts.png"
+#define IMG_Calendar   "/opt/share/icons/default/small/org.tizen.calendar.png"
+#define IMG_Gallery            "/opt/share/icons/default/small/org.tizen.gallery.png"
+#define IMG_VoiceRecorder      "/opt/share/icons/default/small/org.tizen.voicerecorder.png"
+#define IMG_NFC                "/opt/ug/res/icons/ug-setting-nfc-efl/nfc.png"
+#define IMG_DataUsage          SETTING_ICON_PATH_CFG"org.tizen.traf-control.png"
 
 #define IMG_Web_Apps   "/opt/ug/res/icons/ug-webapp-common-efl/WebApplication.png"
 

diff --git a/setting-common/src/setting-cfg.c b/setting-common/src/setting-cfg.c
index 490830c..cb3b9b9 100755 (executable)
--- a/setting-common/src/setting-cfg.c
+++ b/setting-common/src/setting-cfg.c
@@ -203,7 +203,7 @@ int setting_cfg_create(void)
 
 #if SUPPORT_FMradio
        // FMradio setting
-       __create_an_item_by_pkg(KeyStr_FMRadio, "com.samsung.fm-radio", "setting-fmradio-efl", Cfg_Item_Pos_Level0, Cfg_Item_unResetable);
+       __create_an_item_by_pkg(KeyStr_FMRadio, "org.tizen.fm-radio", "setting-fmradio-efl", Cfg_Item_Pos_Level0, Cfg_Item_unResetable);
        SETTING_TRACE_DEBUG("Added FMRadio");
 #endif