Merge "Add isSpaceStr() API for About/Network UG and fix N_SE-11370"

diff --git a/org.tizen.setting.xml b/org.tizen.setting.xml
index 1f8825c..4594edd 100755 (executable)
--- a/org.tizen.setting.xml
+++ b/org.tizen.setting.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.setting" version="0.9.5" install-location="internal-only">
-       <label>Setting</label>
+       <label>Settings</label>
        <author email="mj2004.park@samsung.com" href="www.samsung.com">MyoungJune Park</author>
        <description>Setting Application</description>
        <ui-application appid="org.tizen.setting" exec="/opt/apps/org.tizen.setting/bin/setting" nodisplay="false" multiple="false" type="capp" taskmanage="true">
                <icon>org.tizen.setting.png</icon>
-               <label>Setting</label>
+               <label>Settings</label>
                <label xml:lang="en-us">Settings</label>
                <label xml:lang="nl-nl">Instellingen</label>
                <label xml:lang="de-de">Einstellungen</label>

diff --git a/resource/setting.cfg b/resource/setting.cfg
index 8194b54..379d0ee 100755 (executable)
--- a/resource/setting.cfg
+++ b/resource/setting.cfg
@@ -56,7 +56,7 @@
         "ug_args" : "setting-wifidirect-efl",
         "pos" : 1,
         "click_times" : 0,
-        "is_resetable" : 1
+        "is_resetable" : 0
       }
     ]
   },
@@ -125,7 +125,7 @@
         "ug_args" : "setting-homescreen-efl",
         "pos" : 1,
         "click_times" : 0,
-        "is_resetable" : 1
+        "is_resetable" : 0
       },
       {
         "key_name" : "IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB",

diff --git a/setting-common/src/setting-cfg.c b/setting-common/src/setting-cfg.c
index cb3b9b9..302afcb 100755 (executable)
--- a/setting-common/src/setting-cfg.c
+++ b/setting-common/src/setting-cfg.c
@@ -123,7 +123,7 @@ int setting_cfg_create(void)
 #endif
 
 #if SUPPORT_WIFI_DIRECT
-       __create_an_item(KeyStr_WiFiDirect, IMG_WiFiDirect, "setting-wifidirect-efl", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
+       __create_an_item(KeyStr_WiFiDirect, IMG_WiFiDirect, "setting-wifidirect-efl", Cfg_Item_Pos_Level1, Cfg_Item_unResetable);
 #endif
 
        /* System */
@@ -164,7 +164,7 @@ int setting_cfg_create(void)
 
        __create_an_item(KeyStr_Display, IMG_Dispaly, "setting-display-efl|viewtype:main", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
 #if SUPPORT_MENUSCREEN
-       __create_an_item(KeyStr_Menuscreen, IMG_Menuscreen, "setting-homescreen-efl", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
+       __create_an_item(KeyStr_Menuscreen, IMG_Menuscreen, "setting-homescreen-efl", Cfg_Item_Pos_Level1, Cfg_Item_unResetable);
 #endif
        __create_an_item(KeyStr_Landscape, IMG_Landscape, NULL, Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
        __create_an_item(KeyStr_DateTime, IMG_DateTime, "setting-time-efl", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);

diff --git a/setting-powersaving/src/setting-powersaving-main.c b/setting-powersaving/src/setting-powersaving-main.c
index 5aad158..48ef9ed 100755 (executable)
--- a/setting-powersaving/src/setting-powersaving-main.c
+++ b/setting-powersaving/src/setting-powersaving-main.c
@@ -171,6 +171,8 @@ static int setting_powersaving_main_create(void *cb)
                                         NULL);
        elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL),
                                         ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
+#if DISABLED_CODE
        //B.
        value = 0;
        ret = vconf_get_bool(VCONFKEY_SETAPPL_PWRSV_CUSTMODE_DISPLAY, &value);
@@ -231,6 +233,8 @@ static int setting_powersaving_main_create(void *cb)
                                         NULL);
        elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL),
                                         ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+#endif
+
        //D.
        value = 0;
        ret = vconf_get_bool(VCONFKEY_SETAPPL_PWRSV_CUSTMODE_SCREEN_VIB, &value);
@@ -274,7 +278,7 @@ static int setting_powersaving_main_create(void *cb)
                                             NULL, NULL);
        __BACK_POINTER_SET(ad->data_powersaving_about);
 
-       item = elm_genlist_item_append(scroller, &itc_seperator, NULL, NULL,
+       item = elm_genlist_item_append(scroller, &itc_bottom_seperator, NULL, NULL,
                                       ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);