move to master branch : Fix N_SE-10821

diff --git a/resource/setting.cfg b/resource/setting.cfg
index f062934..8194b54 100755 (executable)
--- a/resource/setting.cfg
+++ b/resource/setting.cfg
@@ -88,6 +88,14 @@
         "is_resetable" : 1
       },
       {
+        "key_name" : "IDS_ST_BODY_SECURITY",
+        "icon_path" : "/opt/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" : "/opt/apps/org.tizen.setting/res/icons/A01-1_icon_Power_saving_mode.png",
         "ug_args" : "setting-powersaving-efl",

diff --git a/setting-display/src/setting-display.c b/setting-display/src/setting-display.c
index 8278bf7..60b5752 100755 (executable)
--- a/setting-display/src/setting-display.c
+++ b/setting-display/src/setting-display.c
@@ -413,6 +413,7 @@ static int setting_reset_display_main(void)
        //ret += setting_reset_display_brightness();
 
        ret += vconf_set_bool(VCONFKEY_SETAPPL_BATTERY_PERCENTAGE_BOOL, FALSE);//battery percent
+       ret += vconf_set_bool(VCONFKEY_SETAPPL_BOOL_AUTO_ADJUST_SCREEN_TONE, TRUE);
        setting_reset_launch_effect();
 
        return ret;