Merge "packaging: spec cleanup" into tizen

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

diff --git a/setting-display/src/setting-display.c b/setting-display/src/setting-display.c
index b2e4f26..720364b 100755 (executable)
--- a/setting-display/src/setting-display.c
+++ b/setting-display/src/setting-display.c
@@ -1,22 +1,18 @@
 /*
  * setting
+ * Copyright (c) 2012 Samsung Electronics Co., Ltd.
  *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Flora License, Version 1.1 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an AS IS BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 /**
@@ -32,7 +28,7 @@
 #include <setting-display.h>
 #include <Ecore_X.h>
 
-#define SETTING_BRIGHTNESS_LEVEL_FOR_EMUL 24
+#define SETTING_BRIGHTNESS_DEFAULT_LEVEL 60
 
 #ifndef UG_MODULE_API
 #define UG_MODULE_API __attribute__ ((visibility("default")))
@@ -103,7 +99,7 @@ static void *setting_display_ug_on_create(ui_gadget_h ug,
 
        SettingDisplayUG *displayUG = priv;
        displayUG->ug = ug;
-       appcore_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
+       setting_set_i18n(SETTING_PACKAGE, SETTING_LOCALEDIR);
 
        displayUG->win_main_layout = (Evas_Object *) ug_get_parent_layout(ug);
        displayUG->win_get = (Evas_Object *) ug_get_window();
@@ -122,14 +118,13 @@ static void *setting_display_ug_on_create(ui_gadget_h ug,
                                   &(displayUG->itc_2text_2));
        setting_create_Gendial_itc("dialogue/1text.1icon",
                                   &(displayUG->itc_1text_1icon));
-       setting_create_Gendial_itc("dialogue/1icon", &(displayUG->itc_layout));
        setting_create_Gendial_itc("dialogue/2text.3/expandable",
                                   &(displayUG->itc_2text_3_parent));
        setting_create_Gendial_itc("dialogue/1text.1icon/expandable2",
                                   &(displayUG->itc_1icon_1text_sub));
        setting_create_Gendial_itc("dialogue/1text", &(displayUG->itc_1text));
 
-       displayUG->itc_seperator.item_style = "dialogue/separator/21/with_line";
+       displayUG->itc_seperator.item_style = "dialogue/separator";
        displayUG->itc_seperator.func.text_get = NULL;
        displayUG->itc_seperator.func.content_get = NULL;
        displayUG->itc_seperator.func.state_get = NULL;
@@ -310,7 +305,7 @@ void setting_display_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,
        case UG_MODE_FULLVIEW:
                evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND,
                                                 EVAS_HINT_EXPAND);
-               elm_win_resize_object_add(ad->win_get, base);
+               //elm_win_resize_object_add(ad->win_get, base);
                evas_object_show(base);
                break;
        default:
@@ -330,16 +325,16 @@ static int setting_reset_display_brightness(void)
 
        if(isEmulBin())
        {
-               ret += vconf_set_int(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, SETTING_BRIGHTNESS_LEVEL_FOR_EMUL);
+               ret += vconf_set_int(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, SETTING_BRIGHTNESS_DEFAULT_LEVEL);
 #if USE_DEVICE_SET_DISPLAY_BRT
-               ret += device_set_brightness(BRIGHTNESS_DISPLAY, SETTING_BRIGHTNESS_LEVEL_FOR_EMUL);
+               ret += device_set_brightness_to_settings(BRIGHTNESS_DISPLAY, SETTING_BRIGHTNESS_DEFAULT_LEVEL);
 #endif
        }
        else
        {
-               ret += vconf_set_int(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, SETTING_BRIGHTNESS_LEVEL7);
+               ret += vconf_set_int(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, SETTING_BRIGHTNESS_DEFAULT_LEVEL);
 #if USE_DEVICE_SET_DISPLAY_BRT
-               ret += device_set_brightness(BRIGHTNESS_DISPLAY, SETTING_BRIGHTNESS_LEVEL7);;
+               ret += device_set_brightness_to_settings(BRIGHTNESS_DISPLAY, SETTING_BRIGHTNESS_DEFAULT_LEVEL);
 #endif
        }
        SETTING_TRACE_END;
@@ -355,7 +350,7 @@ static int setting_reset_display_backlight(void)
        ret += vconf_set_int(VCONFKEY_LCD_TIMEOUT_NORMAL_BACKUP, 0);
 #else
        if(isEmulBin())
-               ret += vconf_set_int(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, 0);
+               ret += vconf_set_int(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, 600);
        else
                ret += vconf_set_int(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, 30);
 #endif
@@ -410,14 +405,16 @@ static int setting_reset_display_main(void)
        SETTING_TRACE_BEGIN;
        int ret = 0;
        ret += setting_reset_display_backlight();
-       ret += setting_reset_display_brightness();
+       //ret += setting_reset_display_brightness();
 
        ret += vconf_set_bool(VCONFKEY_SETAPPL_BATTERY_PERCENTAGE_BOOL, FALSE);//battery percent
        setting_reset_launch_effect();
 
-       // smart screen
-       ret += vconf_set_int(VCONFKEY_PM_SMARTSTAY_STATUS, 0);
-       ret += vconf_set_bool(VCONFKEY_SETAPPL_SMARTSCREEN_SMART_ROTATION, FALSE);
+       ret += vconf_set_bool(VCONFKEY_SETAPPL_BOOL_AUTO_ADJUST_SCREEN_TONE, TRUE);
+
+       // screen mode
+       ret += vconf_set_str(VCONFKEY_SETAPPL_SCREENMODE_SELNAME, "Dynamic");
+       device_set_image_enhance_mode(0);       // 0 => Dynamic
        return ret;
 }
 
@@ -451,6 +448,8 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
 #else
                ret +=  setting_reset_display_main();
 #endif
+       } else if (0 == safeStrCmp(ug_type, "brightness")) {
+               ret += setting_reset_display_brightness();
        }
        return ret;
 }