projects
/
apps
/
core
/
preloaded
/
settings.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
ace8bf0
..
720364b
100755
(executable)
--- a/
setting-display/src/setting-display.c
+++ b/
setting-display/src/setting-display.c
@@
-1,22
+1,18
@@
/*
* setting
/*
* 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
*
* 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
*
* 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.
* 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.
- *
*/
/**
*/
/**
@@
-309,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);
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:
evas_object_show(base);
break;
default:
@@
-331,14
+327,14
@@
static int setting_reset_display_brightness(void)
{
ret += vconf_set_int(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, SETTING_BRIGHTNESS_DEFAULT_LEVEL);
#if USE_DEVICE_SET_DISPLAY_BRT
{
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_DEFAULT_LEVEL);
+ ret += device_set_brightness
_to_settings
(BRIGHTNESS_DISPLAY, SETTING_BRIGHTNESS_DEFAULT_LEVEL);
#endif
}
else
{
ret += vconf_set_int(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, SETTING_BRIGHTNESS_DEFAULT_LEVEL);
#if USE_DEVICE_SET_DISPLAY_BRT
#endif
}
else
{
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_DEFAULT_LEVEL);
+ ret += device_set_brightness
_to_settings
(BRIGHTNESS_DISPLAY, SETTING_BRIGHTNESS_DEFAULT_LEVEL);
#endif
}
SETTING_TRACE_END;
#endif
}
SETTING_TRACE_END;
@@
-354,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_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,
60
0);
else
ret += vconf_set_int(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, 30);
#endif
else
ret += vconf_set_int(VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL, 30);
#endif