From f3a6cd5707af8a2f6bed1376a7a05af340dba9e6 Mon Sep 17 00:00:00 2001 From: Kairong Yin Date: Tue, 28 Aug 2012 22:41:23 -0700 Subject: [PATCH] Adjustion the UI of smart screen accordingly to [Tizen_bada] Smart stay & Smart rotation UI_v1.2_20120821 Change-Id: I2586b961625bccc1c70bfb9d30ff54980c8bbc93 --- setting-common/src/setting-common-draw-popup.c | 2 +- setting-display/src/setting-display-smart-screen.c | 26 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/setting-common/src/setting-common-draw-popup.c b/setting-common/src/setting-common-draw-popup.c index ce00ed5..250e777 100755 --- a/setting-common/src/setting-common-draw-popup.c +++ b/setting-common/src/setting-common-draw-popup.c @@ -479,7 +479,7 @@ Evas_Object *setting_create_popup_with_image_check(void *data, } if (icon_path) { Evas_Object *image = setting_create_image(content_box, icon_path); - setting_resize_object(image, 140*WIDGET_SCALE_FACTOR, 150*WIDGET_SCALE_FACTOR); + setting_resize_object(image, 100*WIDGET_SCALE_FACTOR, 110*WIDGET_SCALE_FACTOR); elm_box_pack_end(content_box, image); } diff --git a/setting-display/src/setting-display-smart-screen.c b/setting-display/src/setting-display-smart-screen.c index e82e532..8a6e0be 100755 --- a/setting-display/src/setting-display-smart-screen.c +++ b/setting-display/src/setting-display-smart-screen.c @@ -21,23 +21,23 @@ #include #define SETTING_DISPLAY_SMART_STAY "IDS_ST_MBODY_SMART_STAY" -#define SETTING_DISPLAY_SMART_STAY_DESC "IDS_ST_SMART_STAY_DESCRIPTION_MSG" +#define SETTING_DISPLAY_SMART_STAY_DESC "Screen stays on as long as you are looking at it" #define SETTING_DISPLAY_SMART_ROTATION "IDS_ST_MBODY_SMART_ROTATION" -#define SETTING_DISPLAY_SMART_ROTATION_DESC "IDS_ST_BODY_DISABLES_AUTO_SCREEN_ROTATION_BY_CHECKING_YOUR_FACE_AND_DEVICES_ORIENTATION" +#define SETTING_DISPLAY_SMART_ROTATION_DESC "Screen display direction adjusts to your angle of sights" -#define SETTING_DISPLAY_SMART_STAY_DLG_STR1 "Smart stay disables screen timeout if device detects that your face is watching the screen" +#define SETTING_DISPLAY_SMART_STAY_DLG_STR1 "Smart stay detects your eyes with the front camera so that the screen stays on when you are looking at it" #define SETTING_DISPLAY_SMART_STAY_DLG_STR2 "Smart stay may not work in these situations:
"\ - " .When front camera fails to detect face
"\ - " .When using device in the dark
"\ + " .When front camera fails to detect face and eyes
"\ + " .When the source of light is behind you or when using device in the dark
"\ " .When front camera is used for the application" -#define SETTING_DISPLAY_SMART_ROTATION_DLG_STR1 "Smart stay disables screen timeout if device detects that your face is watching the screen" +#define SETTING_DISPLAY_SMART_ROTATION_DLG_STR1 "Smart rotation disables auto screen rotation by checking the orientation of your face and the device by its front camera." -#define SETTING_DISPLAY_SMART_ROTATION_DLG_STR2 "Smart stay may not work in these situations:
"\ - " .When front camera fails to detect face
"\ - " .When using device in the dark
"\ +#define SETTING_DISPLAY_SMART_ROTATION_DLG_STR2 "Smart rotation may not work in these situations:
"\ + " .When front camera fails to detect face and eyes
"\ + " .When the source of light is behind you or when using device in the dark
"\ " .When front camera is used for the application
"\ "Screen rotation can be slower if Smart rotation enabled" #define DO_NOT_ASK_AGAIN "Don't ask again" @@ -142,11 +142,11 @@ static void __handle_via_check_status(void *data) if (list_item->chk_status && reminder_flag) { ad->popup = setting_create_popup_with_image_check(ad, ad->win_get, - SETTING_DISPLAY_SMART_STAY, + _(SETTING_DISPLAY_SMART_STAY), _(SETTING_DISPLAY_SMART_STAY_DLG_STR1), _(SETTING_DISPLAY_SMART_STAY_DLG_STR2), SETTING_ICON_PATH_CFG"SmartScreen.png", - _("Don't ask again"), + _(DO_NOT_ASK_AGAIN), &(ad->popup_chk), __smart_stay_on_resp_cb, 0, @@ -174,11 +174,11 @@ static void __handle_via_check_status(void *data) if (list_item->chk_status && reminder_flag) { ad->popup = setting_create_popup_with_image_check(ad, ad->win_get, - SETTING_DISPLAY_SMART_ROTATION, + _(SETTING_DISPLAY_SMART_ROTATION), _(SETTING_DISPLAY_SMART_ROTATION_DLG_STR1), _(SETTING_DISPLAY_SMART_ROTATION_DLG_STR2), SETTING_ICON_PATH_CFG"SmartScreen.png", - _("Don't ask again"), + _(DO_NOT_ASK_AGAIN), &(ad->popup_chk), __smart_rotate_on_resp_cb, 0, -- 2.7.4