Enable "Always on" item in Screen timeout

- Enable "Alway on" in real target

Change-Id: I49a0c1f2114a94e16a04966a7bb7d437c99aca9f
Signed-off-by: kiseok chang <kiso.chang@samsung.com>

diff --git a/setting-common/src/setting-common-general-func.c b/setting-common/src/setting-common-general-func.c
index 3f6fae7158cbb871a54b4dd8dfb4a993f6d07625..caf4e2a57a0efa19416f1b7dadfe1791ca947513 100644 (file)
--- a/setting-common/src/setting-common-general-func.c
+++ b/setting-common/src/setting-common-general-func.c
@@ -199,10 +199,7 @@ char *get_pa_backlight_time_str()
 #if SUPPORT_LCD_TIMEOUT_KEEPING
        if (0 != vconf_get_int(VCONFKEY_LCD_TIMEOUT_NORMAL_BACKUP, &value)) {
                /* value = 600; */
-               if (isEmulBin())
                value = 0; /* keep agree with postin file */
-               else
-               value = 30;
                vconf_set_int(VCONFKEY_LCD_TIMEOUT_NORMAL_BACKUP, value);
        }
 #else
@@ -215,10 +212,7 @@ char *get_pa_backlight_time_str()
                /* file system exceptional handle, eg.
                 * The vconf file lost due to file system. */
                /* value = 600; */
-               if (isEmulBin())
                value = 0; /* keep agree with postin file */
-               else
-               value = 30;
                setting_set_int_slp_key(INT_SLP_SETTING_LCD_TIMEOUT_NORMAL,
                                value, &err);
        }
@@ -231,36 +225,20 @@ char *get_pa_backlight_time_str()
        /* if 120 < < 300, 120 */
        /* if 300 < < 600, 300 */
        /* if > 600, 600 */
-       if (isEmulBin()) {
-               if (SETTING_RETURN_FAIL == ret || value < 15)
-                       value = 0;
-               else if (value >= 15 && value < 30)
-                       value = 15;
-               else if (value >= 30 && value < 60)
-                       value = 30;
-               else if (value >= 60 && value < 120)
-                       value = 60;
-               else if (value >= 120 && value < 300)
-                       value = 120;
-               else if (value >= 300 && value < 600)
-                       value = 300;
-               else
-                       value = 600;
-       } else {
-               if (SETTING_RETURN_FAIL == ret || value < 30)
-                       value = 15;
-               else if (value >= 30 && value < 60)
-                       value = 30;
-               else if (value >= 60 && value < 120)
-                       value = 60;
-               else if (value >= 120 && value < 300)
-                       value = 120;
-               else if (value >= 300 && value < 600)
-                       value = 300;
-               else
-                       value = 600;
-       }
-
+       if (SETTING_RETURN_FAIL == ret || value < 15)
+               value = 0;
+       else if (value >= 15 && value < 30)
+               value = 15;
+       else if (value >= 30 && value < 60)
+               value = 30;
+       else if (value >= 60 && value < 120)
+               value = 60;
+       else if (value >= 120 && value < 300)
+               value = 120;
+       else if (value >= 300 && value < 600)
+               value = 300;
+       else
+               value = 600;
        setting_set_int_slp_key(INT_SLP_SETTING_LCD_TIMEOUT_NORMAL, value,
                        &err);
 #endif
@@ -305,13 +283,6 @@ char *get_pa_backlight_time_str()
 EXPORT_PUBLIC
 int adjust_backlight_time_value(int value)
 {
-#if NORMAL
-       /* value = 600; */
-       if (isEmulBin())
-       value = 0; /* keep agree with postin file */
-       else
-       value = 30;
-#else /* for MDM server */
        /* adjust value. */
        /* if < 15, 15 */
        /* if 15 < < 30, 15 */
@@ -320,36 +291,21 @@ int adjust_backlight_time_value(int value)
        /* if 120 < < 300, 120 */
        /* if 300 < < 600, 300 */
        /* if > 600, 600 */
-       if (isEmulBin()) {
-               if (value < 15)
-                       value = 0;
-               else if (value >= 15 && value < 30)
-                       value = 15;
-               else if (value >= 30 && value < 60)
-                       value = 30;
-               else if (value >= 60 && value < 120)
-                       value = 60;
-               else if (value >= 120 && value < 300)
-                       value = 120;
-               else if (value >= 300 && value < 600)
-                       value = 300;
-               else
-                       value = 600;
-       } else {
-               if (value < 30)
-                       value = 15;
-               else if (value >= 30 && value < 60)
-                       value = 30;
-               else if (value >= 60 && value < 120)
-                       value = 60;
-               else if (value >= 120 && value < 300)
-                       value = 120;
-               else if (value >= 300 && value < 600)
-                       value = 300;
-               else
-                       value = 600;
-       }
-#endif
+       if (value < 15)
+               value = 0;
+       else if (value >= 15 && value < 30)
+               value = 15;
+       else if (value >= 30 && value < 60)
+               value = 30;
+       else if (value >= 60 && value < 120)
+               value = 60;
+       else if (value >= 120 && value < 300)
+               value = 120;
+       else if (value >= 300 && value < 600)
+               value = 300;
+       else
+               value = 600;
+
        return value;
 }
 

diff --git a/setting-display/src/setting-display-main.c b/setting-display/src/setting-display-main.c
index 2e4190417c1ea81685d4bbc39805b6e09fa473d3..109db9ddcc6410beb928c62ad7fd316e8a1ee1c1 100644 (file)
--- a/setting-display/src/setting-display-main.c
+++ b/setting-display/src/setting-display-main.c
@@ -184,26 +184,24 @@ static void setting_display_screen_timeout_popup(void *data)
        ad->screen_timeout_rdg = rdg;
 
        int radio_num =0;
-       if (isEmulBin()) {
-               SETTING_TRACE_ERROR(">>>>>>>>>>>>>> EMULATOR is on!!");
-               ad->data_backlight_always_on = setting_create_Gendial_field_1radio(
-                               menu_glist, &(ad->itc_1text_1icon),
-                                  __screen_timeout_cb,ad,
-                               SWALLOW_Type_1RADIO_RIGHT,
-                               rdg, radio_num,           /* Always ON */
-                               timeout_str_list[radio_num], NULL);
-
-               if (ad->data_backlight_always_on) {
-                       ad->data_backlight_always_on->userdata = ad;
-                       __BACK_POINTER_SET(ad->data_backlight_always_on);
-               } else {
-                       SETTING_TRACE_ERROR("ad->data_backlight_always_on is NULL");
-               }
+       SETTING_TRACE_ERROR(">>>>>>>>>>>>>> EMULATOR is on!!");
+       ad->data_backlight_always_on = setting_create_Gendial_field_1radio(
+                       menu_glist, &(ad->itc_1text_1icon),
+                          __screen_timeout_cb,ad,
+                       SWALLOW_Type_1RADIO_RIGHT,
+                       rdg, radio_num,           /* Always ON */
+                       timeout_str_list[radio_num], NULL);
 
-               _pdm_handle(0, max_inactivity_time, ad->data_backlight_always_on);
-               radio_num++;
+       if (ad->data_backlight_always_on) {
+               ad->data_backlight_always_on->userdata = ad;
+               __BACK_POINTER_SET(ad->data_backlight_always_on);
+       } else {
+               SETTING_TRACE_ERROR("ad->data_backlight_always_on is NULL");
        }
 
+       _pdm_handle(0, max_inactivity_time, ad->data_backlight_always_on);
+       radio_num++;
+
        ad->data_backlight_15sec = setting_create_Gendial_field_1radio(
                        menu_glist, &(ad->itc_1text_1icon),
                        __screen_timeout_cb, ad,
@@ -297,26 +295,22 @@ static void setting_display_screen_timeout_popup(void *data)
        /* update radio */
        setting_get_int_slp_key(
                        ad->data_back->int_slp_setting_binded, &value, &err);
-       if (isEmulBin()) {
-               if (0 == value) {
-                       elm_radio_value_set(rdg, 0);
-               }
-               radio_num = 1;
-       } else {
-               radio_num = 0;
-       }
-       if (15 == value) {
+
+       radio_num = 0;
+       if (0 == value) {
                elm_radio_value_set(rdg, radio_num + 0);
-       } else if (30 == value) {
+       } else if (15 == value) {
                elm_radio_value_set(rdg, radio_num + 1);
-       } else if (60 == value) {
+       } else if (30 == value) {
                elm_radio_value_set(rdg, radio_num + 2);
-       } else if (120 == value) {
+       } else if (60 == value) {
                elm_radio_value_set(rdg, radio_num + 3);
-       } else if (300 == value) {
+       } else if (120 == value) {
                elm_radio_value_set(rdg, radio_num + 4);
-       } else if (600 == value) {
+       } else if (300 == value) {
                elm_radio_value_set(rdg, radio_num + 5);
+       } else if (600 == value) {
+               elm_radio_value_set(rdg, radio_num + 6);
        }
 }