remove screen mode menu

patchset2. remove dependency

Change-Id: I9855f20aaf3916c341b729b65295240d58fa4aa7

diff --git a/setting-display/CMakeLists.txt b/setting-display/CMakeLists.txt
index eebefe4a1f9a3555c7be824ffbf9a5d1e5365c04..1cb10d52bf65725d2524503278493e8453135fda 100755 (executable)
--- a/setting-display/CMakeLists.txt
+++ b/setting-display/CMakeLists.txt
@@ -27,7 +27,6 @@ ADD_LIBRARY(${SETTING_DISPLAY_UG} SHARED
        ##./src/setting-display-backlight.c
        ./src/setting-display-brightness.c
        ./src/setting-display-wallpaper.c
-       ./src/setting-display-screen-mode.c
        ./src/setting-display-smart-screen.c
        )
 

diff --git a/setting-display/include/setting-display.h b/setting-display/include/setting-display.h
index 6028a78814bca1e62fd1db43ff5f94811d404a7a..911b4c1769c2cab9386b9f80af698041393100e3 100755 (executable)
--- a/setting-display/include/setting-display.h
+++ b/setting-display/include/setting-display.h
@@ -124,7 +124,6 @@ struct _SettingDisplayUG {
 extern setting_view setting_view_display_main;
 extern setting_view setting_view_display_brightness;
 extern setting_view setting_view_display_wallpaper;
-extern setting_view setting_view_display_screen_mode;
 extern setting_view setting_view_display_smart_screen;
 
 void setting_display_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,

diff --git a/setting-display/src/setting-display-main.c b/setting-display/src/setting-display-main.c
index 357e2fa64e91f8ba7faf7e97c610a34336e70dd8..8b7bcf892d227b09690c728445b076120591e12f 100755 (executable)
--- a/setting-display/src/setting-display-main.c
+++ b/setting-display/src/setting-display-main.c
@@ -178,28 +178,6 @@ static int setting_display_main_create(void *cb)
        char *curmode = vconf_get_str(VCONFKEY_SETAPPL_SCREENMODE_SELNAME);
        SETTING_TRACE(">>> CUR SCREEN MODE : %s ", curmode);
 
-       int i = 0;
-       for (; i < sizeof(str_in_arr)/sizeof(str_in_arr[0]); i++) {
-               if (0 == safeStrCmp(str_in_arr[i], curmode)) {
-                       ad->data_screen_mode = setting_create_Gendial_field_def(scroller, &(itc_2text_3),
-                                    setting_display_main_mouse_up_Gendial_list_cb,
-                                    ad, SWALLOW_Type_INVALID, NULL,
-                                    NULL, 0, Keystr_ScreenMode,
-                                    _(str_out_arr[i]), NULL);
-                       if (ad->data_screen_mode) {
-                               ad->data_screen_mode->userdata = ad;
-                       } else {
-                               SETTING_TRACE_ERROR("ad->data_screen_mode is NULL");
-                       }
-                       break;
-               }
-       }
-
-       item =
-           elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL,
-                                   ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
        #if !SUPPOR_SEPARATE_BRIGHTNESS
        /* BRIGHTNESS */
        ad->data_br =
@@ -505,9 +483,6 @@ setting_display_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
                elm_check_state_set(list_item->eo_check, list_item->chk_status);
                vconf_set_bool(VCONFKEY_SETAPPL_BATTERY_PERCENTAGE_BOOL, list_item->chk_status);
        }
-       else if (!safeStrCmp(Keystr_ScreenMode, list_item->keyStr)) {
-               setting_view_change(&setting_view_display_main, &setting_view_display_screen_mode, ad);
-       }
        else if (!safeStrCmp(Keystr_SmartScreen, list_item->keyStr)) {
                setting_view_change(&setting_view_display_main, &setting_view_display_smart_screen, ad);
        }

diff --git a/setting-display/src/setting-display.c b/setting-display/src/setting-display.c
index 64b38b9047fd512a6124e406278fc4915c08c0df..48378b4fbe7625879cb5e750d3759e945683701c 100755 (executable)
--- a/setting-display/src/setting-display.c
+++ b/setting-display/src/setting-display.c
@@ -59,8 +59,6 @@ setting_view *__get_display_view_to_load(service_h service)
                return &setting_view_display_wallpaper;
        } else {
                setting_view_node_table_register(&setting_view_display_main, NULL);
-               setting_view_node_table_register(&setting_view_display_screen_mode,
-                                                &setting_view_display_main);
                setting_view_node_table_register(&setting_view_display_brightness,
                                                 &setting_view_display_main);
                setting_view_node_table_register(&setting_view_display_smart_screen,
@@ -179,7 +177,6 @@ static void setting_display_ug_on_destroy(ui_gadget_h ug, service_h service,
        if (&setting_view_display_main == displayUG->view_to_load) {
                setting_view_destroy(&setting_view_display_brightness,
                                     displayUG);
-               setting_view_destroy(&setting_view_display_screen_mode, displayUG);
                setting_view_destroy(&setting_view_display_smart_screen, displayUG);
                setting_view_destroy(&setting_view_display_main, displayUG);
        } else if (&setting_view_display_wallpaper == displayUG->view_to_load) {