Removed "Rotation" toggle from Display

There is no roration element on Settings/Display UI guide

Change-Id: I404e257890a646aba0ef0d4a2ec09ef879778d31
Signed-off-by: Bartlomiej Uliasz <b.uliasz@samsung.com>

diff --git a/setting-display/include/setting-display-main.h b/setting-display/include/setting-display-main.h
index 6c57b68c52610bcf7a1e9009ce92ce2b602b066c..b1873c2b6a7b9092a1de06c2903426522e2fa93f 100644 (file)
--- a/setting-display/include/setting-display-main.h
+++ b/setting-display/include/setting-display-main.h
@@ -25,9 +25,6 @@
 #include <setting-display-brightness.h>
 /** @todo need to i18n string registration */
 
-static void setting_display_main_auto_rotate_chk_btn_cb(void *data,
-               Evas_Object *obj, void *event_info);
-
 static void setting_display_main_mouse_up_Gendial_list_cb(void *data,
                Evas_Object *obj,
                void *event_info);

diff --git a/setting-display/include/setting-display.h b/setting-display/include/setting-display.h
index b7b513253b55055ded8a2b4873ae56296825ebcf..1525f046856cc24a46c02ab42aaeb4981e799a79 100644 (file)
--- a/setting-display/include/setting-display.h
+++ b/setting-display/include/setting-display.h
@@ -110,7 +110,6 @@ typedef struct _SettingDisplay {
        Setting_GenGroupItem_Data *data_br_sli;
        Setting_GenGroupItem_Data *data_adjust;
        Setting_GenGroupItem_Data *data_overheating;
-       Setting_GenGroupItem_Data *data_auto_rotate;
 
        setting_view *view_to_load;
 

diff --git a/setting-display/src/setting-display-main.c b/setting-display/src/setting-display-main.c
index a175cafbbebbf02c6198fffcb3d7f8a43f995e19..3c285d1f27998a23bb1d0fb3ce606a9909afc352 100755 (executable)
--- a/setting-display/src/setting-display-main.c
+++ b/setting-display/src/setting-display-main.c
@@ -42,7 +42,6 @@ static void setting_display_main_click_softkey_back_cb(
                        void *event_info);
 static Eina_Bool _main_view_pop_cb(void *data, Elm_Object_Item *it);
 static void _get_font_name_string(char *buff, int len_max);
-static bool _get_screen_autorotate(void);
 static bool _get_battery_lvl_less_than_low(void);
 
 static int setting_display_main_create(void *cb);
@@ -131,7 +130,8 @@ static int get_max_inactivity_time_device_lock_handler(int *max_inactivity_time)
        return -1;
 }
 
-static void _pdm_handle(int radio_num, int max_inactivity_time, Setting_GenGroupItem_Data *data)
+static void _pdm_handle(int radio_num, int max_inactivity_time,
+               Setting_GenGroupItem_Data *data)
 {
        if (timeout_val_list[radio_num] <= max_inactivity_time)
                setting_enable_genlist_item(data->item);
@@ -152,7 +152,8 @@ static void setting_display_screen_timeout_popup(void *data)
 
        int max_inactivity_time = -1;
        get_max_inactivity_time_device_lock_handler(&max_inactivity_time);
-       SETTING_TRACE(" -----------------> max_inactivity_time = %d", max_inactivity_time);
+       SETTING_TRACE(" -----------------> max_inactivity_time = %d",
+                       max_inactivity_time);
 
 
        ad->screen_timeout_popup = setting_create_popup_with_list(
@@ -185,7 +186,8 @@ static void setting_display_screen_timeout_popup(void *data)
                __BACK_POINTER_SET(ad->data_backlight_always_on);
 
 
-               _pdm_handle(0, max_inactivity_time, ad->data_backlight_always_on);
+               _pdm_handle(0, max_inactivity_time,
+                               ad->data_backlight_always_on);
        } else {
                SETTING_TRACE_ERROR("ad->data_backlight_always_on is NULL");
        }
@@ -371,22 +373,6 @@ static int setting_display_main_create(void *cb)
                SETTING_TRACE_ERROR("ad->data_font is NULL");
        }
 
-       /* AUTO ROTATE */
-       ad->data_auto_rotate = setting_create_Gendial_field_def(
-                       ad->md.genlist, &(ad->itc_1text_1icon),
-                       setting_display_main_mouse_up_Gendial_list_cb,
-                       ad, SWALLOW_Type_1ICON_1RADIO, NULL,
-                       NULL, _get_screen_autorotate(),
-                       "IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB",
-                       NULL,
-                       setting_display_main_auto_rotate_chk_btn_cb);
-       if (ad->data_auto_rotate) {
-               ad->data_auto_rotate->userdata = ad;
-               __BACK_POINTER_SET(ad->data_auto_rotate);
-       } else {
-               SETTING_TRACE_ERROR("ad->data_battery is NULL");
-       }
-
        /* BACKLIGHTTIME */
        pa_backlight_time = get_pa_backlight_time_str();
        ad->data_back =
@@ -482,11 +468,6 @@ static int setting_display_main_update(void *cb)
                elm_genlist_item_update(ad->data_back->item);
        }
 
-       if (ad->data_auto_rotate) {
-               ad->data_auto_rotate->chk_status = _get_screen_autorotate();
-               elm_genlist_item_update(ad->data_auto_rotate->item);
-       }
-
        return SETTING_RETURN_SUCCESS;
 }
 
@@ -530,13 +511,11 @@ gboolean setting_display_create_font_sg(void *data)
 }
 
 static void setting_display_main_mouse_up_Gendial_list_cb(void *data,
-                                                                                                               Evas_Object *obj,
-                                                                                                               void *event_info)
+               Evas_Object *obj, void *event_info)
 {
        Elm_Object_Item *item = (Elm_Object_Item *) event_info;
        SettingDisplay *ad = (SettingDisplay *)data;
        Setting_GenGroupItem_Data *list_item = NULL;
-       int ret = 0;
 
        setting_retm_if(data == NULL, "Data parameter is NULL");
        retm_if(event_info == NULL, "Invalid argument: event info is NULL");
@@ -546,22 +525,9 @@ static void setting_display_main_mouse_up_Gendial_list_cb(void *data,
 
        setting_retm_if(NULL == list_item, "list_item is NULL");
        SETTING_TRACE("clicking item[%s]", _(list_item->keyStr));
-       if (!safeStrCmp("IDS_ST_HEADER_AUTO_ROTATE_SCREEN_ABB",
-                       list_item->keyStr)) {
-
-               ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_DISPLAY_SCREEN_ROTATION_AUTO, !(list_item->chk_status));
-               if (!ret) {
-                       setting_update_gl_item_chk_status(list_item, !(list_item->chk_status));
-               } else {
-                       SETTING_TRACE_ERROR("Error setting SYSTEM_SETTINGS_KEY_DISPLAY_SCREEN_ROTATION_AUTO value: %s",
-                                                                               get_error_message(ret));
-               }
-       }
-
        if (!safeStrCmp(KeyStr_Font, list_item->keyStr))
                setting_display_create_font_sg(ad);
-
-       if (!safeStrCmp(KeyStr_BacklightTime, list_item->keyStr))
+       else if (!safeStrCmp(KeyStr_BacklightTime, list_item->keyStr))
                setting_display_screen_timeout_popup(ad);
 }
 
@@ -581,25 +547,14 @@ static void _get_font_name_string(char *buff, int len_max)
                return;
 
        current_font_type_str = cur_font_get();
-       (void)system_settings_get_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE, &value);
+       (void)system_settings_get_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE,
+                       &value);
        current_font_size_str = get_font_size_str(value);
        snprintf(buff, NAME_MAX, "%s, %s", _(current_font_size_str),
                        current_font_type_str);
        free(current_font_type_str);
 }
 
-static bool _get_screen_autorotate(void)
-{
-       int ret = 0;
-       bool value = false;
-
-       ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_DISPLAY_SCREEN_ROTATION_AUTO, &value);
-       if (ret)
-               SETTING_TRACE_ERROR("Error getting SYSTEM_SETTINGS_KEY_DISPLAY_SCREEN_ROTATION_AUTO value: %s",
-                                                       get_error_message(ret));
-       return value;
-}
-
 static bool _get_battery_lvl_less_than_low(void)
 {
        device_battery_level_e batt_stat = DEVICE_BATTERY_LEVEL_EMPTY;
@@ -608,7 +563,7 @@ static bool _get_battery_lvl_less_than_low(void)
        ret = device_battery_get_level_status(&batt_stat);
        if (ret)
                SETTING_TRACE_ERROR("Error getting battery level value: %s",
-                                                       get_error_message(ret));
+                               get_error_message(ret));
        return (batt_stat < DEVICE_BATTERY_LEVEL_LOW);
 }
 
@@ -618,22 +573,3 @@ static void setting_display_main_click_softkey_back_cb(
 {
        ui_app_exit();
 }
-
-static void setting_display_main_auto_rotate_chk_btn_cb(
-               void *data, Evas_Object *radio, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       int ret = 0;
-       Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *)data;
-
-       retm_if(data == NULL, "Data parameter is NULL");
-
-       list_item->chk_status = elm_check_state_get(radio);
-       ret = system_settings_set_value_bool(SYSTEM_SETTINGS_KEY_DISPLAY_SCREEN_ROTATION_AUTO, list_item->chk_status);
-
-       if (ret) {
-               SETTING_TRACE_ERROR("Error setting SYSTEM_SETTINGS_KEY_DISPLAY_SCREEN_ROTATION_AUTO value: %s",
-                                                       get_error_message(ret));
-               setting_update_gl_item_chk_status(list_item, !(list_item->chk_status));
-       }
-}