Merge branch 'tizen_2.1_smack' into tizen_2.1

[apps/core/preloaded/settings.git] / resource / setting.cfg

diff --git a/resource/setting.cfg b/resource/setting.cfg
index d3ff3a7..3bcb5eb 100755 (executable)
--- a/resource/setting.cfg
+++ b/resource/setting.cfg
@@ -3,14 +3,6 @@
     "name" : "IDS_ST_BODY_CONNECTIVITY",
     "menu" : [
       {
-        "key_name" : "IDS_ST_BODY_FLIGHT_MODE",
-        "icon_path" : "/usr/apps/org.tizen.setting/res/icons/A01-1_icon_Flight_Mode.png",
-        "ug_args" : "(null)",
-        "pos" : 0,
-        "click_times" : 0,
-        "is_resetable" : 0
-      },
-      {
         "key_name" : "IDS_COM_BODY_WI_FI",
         "icon_path" : "/usr/apps/org.tizen.setting/res/icons/A01-1_icon_Wi-Fi.png",
         "ug_args" : "wifi-efl-UG",
@@ -21,7 +13,7 @@
       {
         "key_name" : "IDS_MOBILEAP_BODY_TETHERING",
         "icon_path" : "/usr/apps/org.tizen.setting/res/icons/A01-1_icon_mobileAP.png",
-        "ug_args" : "setting-mobile-ap-ug",
+        "ug_args" : "setting-mobileap-efl",
         "pos" : 0,
         "click_times" : 0,
         "is_resetable" : 1
@@ -72,6 +64,14 @@
     "name" : "IDS_COM_BODY_SYSTEM",
     "menu" : [
       {
+        "key_name" : "IDS_ST_BODY_FLIGHT_MODE",
+        "icon_path" : "/usr/apps/org.tizen.setting/res/icons/A01-1_icon_Flight_Mode.png",
+        "ug_args" : "(null)",
+        "pos" : 0,
+        "click_times" : 0,
+        "is_resetable" : 0
+      },
+      {
         "key_name" : "IDS_COM_BODY_WALLPAPER",
         "icon_path" : "/usr/apps/org.tizen.setting/res/icons/A01-1_icon_Wallpaper.png",
         "ug_args" : "setting-display-efl|viewtype:wallpaper",
@@ -96,14 +96,6 @@
         "is_resetable" : 1
       },
       {
-        "key_name" : "IDS_ST_BODY_SECURITY",
-        "icon_path" : "/usr/apps/org.tizen.setting/res/icons/A01-1_icon_Security.png",
-        "ug_args" : "setting-security-efl",
-        "pos" : 0,
-        "click_times" : 0,
-        "is_resetable" : 1
-      },
-      {
         "key_name" : "IDS_ST_BODY_POWER_SAVING_MODE",
         "icon_path" : "/usr/apps/org.tizen.setting/res/icons/A01-1_icon_Power_saving_mode.png",
         "ug_args" : "setting-powersaving-efl",
@@ -128,6 +120,14 @@
         "is_resetable" : 1
       },
       {
+        "key_name" : "IDS_ST_BODY_SECURITY",
+        "icon_path" : "/usr/apps/org.tizen.setting/res/icons/A01-1_icon_Security.png",
+        "ug_args" : "setting-security-efl",
+        "pos" : 0,
+        "click_times" : 0,
+        "is_resetable" : 1
+      },
+      {
         "key_name" : "IDS_ST_HEADER_HOME_SCREEN_ABB",
         "icon_path" : "/usr/apps/org.tizen.setting/res/icons/A01-1_icon_Menu.png",
         "ug_args" : "setting-homescreen-efl",
@@ -184,14 +184,6 @@
         "is_resetable" : 1
       },
       {
-        "key_name" : "IDS_ST_BODY_MEMORY",
-        "icon_path" : "/usr/apps/org.tizen.setting/res/icons/A01-1_icon_Memory.png",
-        "ug_args" : "setting-memory-efl",
-        "pos" : 1,
-        "click_times" : 0,
-        "is_resetable" : 1
-      },
-      {
         "key_name" : "IDS_COM_BODY_RESET",
         "icon_path" : "/usr/apps/org.tizen.setting/res/icons/A01-1_icon_Reset.png",
         "ug_args" : "setting-reset-efl",
@@ -221,6 +213,14 @@
     "name" : "IDS_COM_BODY_APPLICATIONS",
     "menu" : [
       {
+               "key_name" : "Accounts",
+               "icon_path" : "/usr/apps/org.tizen.setting/res/icons/A01-1_icon_Accounts.png",
+               "ug_args" : "setting-myaccount-efl|mode:account_list",
+               "pos" : 0,
+               "click_times" : 0,
+               "is_resetable" : 0
+      },
+      {
         "key_name" : "IDS_COM_BODY_CALL",
         "icon_path" : "/usr/share/icons/default/small/org.tizen.phone.png",
         "ug_args" : "setting-call-efl",