change key name from rotate lock to auto rotate screen
authorHyejin Kim <hyejin0906.kim@samsung.com>
Thu, 17 Jan 2013 10:39:42 +0000 (19:39 +0900)
committerHyejin Kim <hyejin0906.kim@samsung.com>
Thu, 17 Jan 2013 10:40:37 +0000 (19:40 +0900)
setting-reset/src/setting-reset.c
src/setting-main.c
src/setting.c

index b700d4f..f01fc0b 100755 (executable)
@@ -349,7 +349,7 @@ int setting_reset_rotation_lock(void)
 #if SUPPORT_RUN_SYSTEM_COMMAND
        return excuteCmd(SETTING_POSTINST_FILE, 1, "rotationLock");
 #else
-       return vconf_set_bool(VCONFKEY_SETAPPL_ROTATE_LOCK_BOOL, TRUE);
+       return vconf_set_bool(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, FALSE);
 #endif
 }
 
index 13dee5e..aec632f 100755 (executable)
@@ -852,10 +852,7 @@ void __load_system_menu_list(void *data, Cfg_Item_Position inputPos, Evas_Object
                        if (!safeStrCmp(KeyStr_Landscape, keyStr)) {    /* load special UG */
                                int value = 0;
                                vconf_get_bool
-                                   (VCONFKEY_SETAPPL_ROTATE_LOCK_BOOL, &value);
-                               // true  : auto rotation OFF
-                               // false : auto rotation ON
-                               value = !value;
+                                   (VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, &value);
 
                                ad->data_rotationMode =
                                    setting_create_Gendial_field_groupitem(genlist,
@@ -2232,7 +2229,7 @@ static void __rotate_lock_handler(int chk_status, setting_main_appdata *ad )
        } else {
                elm_win_rotation_with_resize_set(ad->win_main, 0);
        }
-       vconf_set_bool(VCONFKEY_SETAPPL_ROTATE_LOCK_BOOL, !chk_status);
+       vconf_set_bool(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, chk_status);
 }
 
 /**
index 6577c09..30a73ea 100755 (executable)
@@ -241,8 +241,7 @@ static void setting_main_rotate(app_device_orientation_e m, void *data)
        //}
 
        int value = 0;
-       vconf_get_bool (VCONFKEY_SETAPPL_ROTATE_LOCK_BOOL, &value);
-       value = !value;
+       vconf_get_bool (VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, &value);
 
        if (value == 0)
                m = 0;
@@ -470,14 +469,14 @@ static void setting_other_vconf_change_cb(keynode_t *key, void *data)
                        }
                }
                return;
-       } else if (!safeStrCmp(vconf_name, VCONFKEY_SETAPPL_ROTATE_LOCK_BOOL)) {
+       } else if (!safeStrCmp(vconf_name, VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL)) {
                item_to_update = ad->data_rotationMode;
                retm_if(!item_to_update, "ad->data_rotationMode is NULL");
 
                int status = 0;
-               vconf_get_bool(VCONFKEY_SETAPPL_ROTATE_LOCK_BOOL, &status);
+               vconf_get_bool(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, &status);
 
-               item_to_update->chk_status = !status;
+               item_to_update->chk_status = status;
                //do not need delay for checks
                elm_check_state_set(item_to_update->eo_check, item_to_update->chk_status);
                SETTING_TRACE("item_to_update->chk_status:%d", item_to_update->chk_status);
@@ -940,9 +939,9 @@ static void setting_main_app_reset(service_h service, void *data)
        setting_main_appdata *ad = data;
 
        int value = 0;
-       vconf_get_bool (VCONFKEY_SETAPPL_ROTATE_LOCK_BOOL, &value);
+       vconf_get_bool (VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, &value);
        SETTING_TRACE("value:%d", value);
-       if (!value) //rotation function is not blocked
+       if (value) //rotation function is not blocked
        {
                SETTING_TRACE("Rotation function is on, it is necessary to adjust the device orientation");
                int mode = APP_DEVICE_ORIENTATION_0;
@@ -969,7 +968,7 @@ static void setting_main_app_reset(service_h service, void *data)
        REGISTER_VCONF_NODE(ad->listened_list, VCONFKEY_SETAPPL_WIDGET_THEME_STR, cb, ad);
 
        REGISTER_VCONF_NODE(ad->listened_list, VCONFKEY_TELEPHONY_FLIGHT_MODE, cb, ad);
-       REGISTER_VCONF_NODE(ad->listened_list, VCONFKEY_SETAPPL_ROTATE_LOCK_BOOL, cb, ad);
+       REGISTER_VCONF_NODE(ad->listened_list, VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, cb, ad);
        REGISTER_VCONF_NODE(ad->listened_list, VCONFKEY_NFC_STATE, cb, ad);
 
        if (ad->win_main)