Fix N_SE-8235

[apps/core/preloaded/settings.git] / setting-display / src / setting-display-brightness.c

diff --git a/setting-display/src/setting-display-brightness.c b/setting-display/src/setting-display-brightness.c
index 68cdc03..c255e26 100755 (executable)
--- a/setting-display/src/setting-display-brightness.c
+++ b/setting-display/src/setting-display-brightness.c
@@ -46,7 +46,7 @@ static void __toggle_automatic_chk(void* data, int chk_status);
  *basic func
  *
  ***************************************************/
-
+#if DISABLED_CODE
 static Eina_Bool setting_display_brightness_on_idle(void *data)
 {
        SETTING_TRACE_BEGIN;
@@ -58,7 +58,7 @@ static Eina_Bool setting_display_brightness_on_idle(void *data)
        __toggle_automatic_chk(ad, auto_value);
        return FALSE;
 }
-
+#endif
 
 // low battery
 static void setting_display_brightness_lowbat_cb(keynode_t *key, void* data)
@@ -149,7 +149,7 @@ static int setting_display_brightness_create(void *cb)
 
        elm_object_part_content_set(sub_layout, "search_list2", genlist);
 
-       int auto_value, value;
+       int auto_value;
        int err;
        Elm_Object_Item *item = NULL;;
 
@@ -187,13 +187,6 @@ static int setting_display_brightness_create(void *cb)
        }
 
        /* check manual */
-       int ret = setting_get_int_slp_key(INT_SLP_SETTING_LCD_BRIGHTNESS, &value,
-                                   &err);
-       if (ret == SETTING_RETURN_FAIL) {
-               value = SETTING_BRIGHTNESS_LEVEL5;
-       }
-
-       SETTING_TRACE("******* value = %d ", value);
        int max_brt;
        if (DEVICE_ERROR_NONE != device_get_max_brightness(BRIGHTNESS_DISPLAY, &max_brt)) {
                SETTING_TRACE("Fail to get the max brightness of the display.\n");
@@ -202,6 +195,19 @@ static int setting_display_brightness_create(void *cb)
                SETTING_TRACE("Max brightness of the display is %d\n", max_brt);
        }
 
+       // get initial value from vconf
+#if DISABLED_CODE
+       int ret = setting_get_int_slp_key(INT_SLP_SETTING_LCD_BRIGHTNESS, &value, &err);
+       if (ret == SETTING_RETURN_FAIL) {
+               value = SETTING_BRIGHTNESS_LEVEL5;
+               SETTING_TRACE("******* value = %d ", value);
+       }
+#else
+       int value = SETTING_BRIGHTNESS_LEVEL7;
+       device_get_brightness(BRIGHTNESS_DISPLAY, &value);
+       SETTING_TRACE("******* value = %d ", value);
+#endif
+
        // [UI] Slider control for Bightness
        ad->data_br_sli =
            setting_create_Gendial_field_def(genlist, &(ad->itc_layout), NULL,
@@ -241,7 +247,7 @@ static int setting_display_brightness_create(void *cb)
        vconf_notify_key_changed(VCONFKEY_SYSMAN_BATTERY_STATUS_LOW, setting_display_brightness_lowbat_cb, ad);
 
        setting_view_display_brightness.is_create = 1;
-       ecore_idler_add(setting_display_brightness_on_idle, ad);
+       //ecore_idler_add(setting_display_brightness_on_idle, ad);
        return SETTING_RETURN_SUCCESS;
 }
 
@@ -321,7 +327,8 @@ static void __toggle_automatic_chk(void* data, int chk_status)
        } else {
                // TOGGLE OFF
                int value = SETTING_BRIGHTNESS_LEVEL7;
-               device_get_brightness(BRIGHTNESS_DISPLAY, &value);
+               //device_get_brightness(BRIGHTNESS_DISPLAY, &value);
+               value = elm_slider_value_get(ad->data_br_sli->eo_check);
 
                SETTING_TRACE(" SENOSR :: %d ", value);
 
@@ -334,10 +341,10 @@ static void __toggle_automatic_chk(void* data, int chk_status)
                        return;
                }
 
-#ifdef USE_DEVICE_SET_DISPLAY_BRT
-               setting_display_set_slider_value(ad,ad->data_br_sli->eo_check , value);
+               ad->data_br_sli->chk_status = value;
+               setting_set_int_slp_key(INT_SLP_SETTING_LCD_BRIGHTNESS, value, &err);
                elm_slider_value_set(ad->data_br_sli->eo_check, value);
-#endif
+
                setting_enable_genlist_item(ad->data_br_sli->item);
        }