Code cleaning for setting-applications module 69/74069/6
authorPiotr Pruski <p.pruski@samsung.com>
Fri, 10 Jun 2016 14:49:00 +0000 (16:49 +0200)
committerMyoungJune Park <mj2004.park@samsung.com>
Tue, 28 Jun 2016 01:50:49 +0000 (10:50 +0900)
Deleted unused code, fixed include guards

Conflicts:
setting-applications/src/setting-applications-defaultapp.c

Change-Id: Ic60dd0aa2a19836a9c0feed4accd5cc6cf8ea9f0
Signed-off-by: Piotr Pruski <p.pruski@samsung.com>
setting-applications/include/setting-applications-defaultapp.h
setting-applications/include/setting-applications.h
setting-applications/src/setting-applications-defaultapp.c
setting-applications/src/setting-applications-main.c
setting-applications/src/setting-applications.c
setting-appmgr/include/setting-appmgr-string.h
setting-appmgr/src/setting-appmgr-pkginfo-utils.c

index f5d74aac52e42b6ecd64479b88399599dde36dc9..e9381b8efc4caf30c03409fef14c1e9b0ad65456 100644 (file)
@@ -30,7 +30,8 @@
        "IDS_ST_BODY_TO_AVOID_OVERHEATING_MAXIMUM_BRIGHTNESS_HAS_BEEN_REDUCED"
 #define MGRAPP_STR_LAUNCH_BY_DEFAULT "IDS_ST_BODY_LAUNCH_BY_DEFAULT"
 #define MGRAPP_STR_CLEAR_DEFAULT "IDS_ST_BODY_CLEAR_DEFAULTS"
+#define MGRAPP_STR_DEFAULT_NO_APPS "There are no apps set as defaults."
 
 void __display_int_vconf_cb(keynode_t *key, void *data);
 
-#endif                         /* __SETTING_APPLICATIONS_DEFAULTAPP_H__ */
+#endif /* __SETTING_APPLICATIONS_DEFAULTAPP_H__ */
index da3e3147500b5852ed2b1e502d27f33105b709a7..88012ef4980d124bd26da0c1102adf3c961ceedc 100644 (file)
@@ -18,8 +18,8 @@
  * limitations under the License.
  *
  */
-#ifndef __SETTING_DISPLAY_H__
-#define __SETTING_DISPLAY_H__
+#ifndef __SETTING_APPLICATION_H__
+#define __SETTING_APPLICATION_H__
 
 #include <stdio.h>
 #include <string.h>
@@ -30,7 +30,6 @@
 
 #include <Elementary.h>
 
-
 #include <glib-object.h>
 
 #include <setting-common-draw-widget.h>
 
 #define SAFE_STRDUP(src) (src) ? strdup(src) : NULL
 
-#define Keystr_Dynamic         "IDS_ST_BODY_DYNAMIC_T_DISPLAY_EFFECT"
-#define Keystr_Standard                "IDS_ST_BODY_STANDARD_T_DISPLAY_EFFECT"
-#define Keystr_Natural         "IDS_ST_BODY_NATURAL_T_DISPLAY_EFFECT"
-#define Keystr_Movie           "IDS_ST_BODY_MOVIE_T_DISPLAY_EFFECT"
-
-#define LAUNCH_EFFECT_STR "IDS_ST_BODY_APP_OPENING_EFFECT"
-#define LAUNCH_IMAGE_STR  "IDS_ST_BODY_APP_OPENING_IMAGE"
-
-#define KeyStr_AdjustScreenTone_Dsc "IDS_ST_BODY_SAVE_POWER_BY_ADJUSTING_"\
-       "SCREEN_TONE_ACCORDING_TO_ANALYSIS_OF_IMAGES"
-#define KeyStr_HighTouchSensitivity_Dsc "IDS_ST_SBODY_INCREASE_THE_"\
-       "SENSITIVITY_OF_THE_TOUCH_SCREEN_SBODY_MSG"
-
-/* Increase the screen's sensitivity so you can touch it while wearing gloves */
-#define LAUNCH_BATTERY_DESC "IDS_ST_BODY_SHOWS_BATTERY_PERCENTAGE_ON_INDICATOR"
-
-#define SETTING_DISPLAY_TIME_15_SEC_STR "IDS_ST_BODY_15SEC"
-#define SETTING_DISPLAY_TIME_30_SEC_STR "IDS_ST_BODY_30SEC"
-#define SETTING_DISPLAY_TIME_1_MIN_STR "IDS_ST_BODY_1_MINUTE"
+#define Keystr_Clear           "Clear"
 
-#define SETTING_DISPLAY_TIME_2_MIN_STR "IDS_ST_BODY_2_MINUTES"
-#define SETTING_DISPLAY_TIME_5_MIN_STR "IDS_ST_BODY_5_MINUTES"
-#define SETTING_DISPLAY_TIME_10_MIN_STR "IDS_ST_BODY_10_MINUTES"
 #define SMART_SCREEN_TRY_IT_IMAGE_L \
        SETTING_ICON_PATH_CFG"air_jump_try_full_h.png"
 #define SMART_SCREEN_TRY_IT_IMAGE_P \
 #define KeyStr_ScreenCapture_Edit "IDS_ST_MBODY_EDIT_AFTER_SCREEN_CAPTURE"
 #define KeyStr_Dynamic_Status_Bar "IDS_ST_BODY_DYNAMIC_STATUS_BAR"
 
-#define POPUP_TURN_ON_STR "IDS_ST_BUTTON_ENABLE"
-
-#define SAMRT_SCREEN_TRY_IT_IAMGE_PORTRAIT_H 2636
-#define SAMRT_SCREEN_TRY_IT_IAMGE_PORTRAIT_W 720
-#define SAMRT_SCREEN_TRY_IT_IAMGE_LANDSCAPE_H 2055
-#define SAMRT_SCREEN_TRY_IT_IAMGE_LANDSCAPE_W 1280
-#define SETTING_DISPLAY_ICON_PATH 12
-
-typedef enum {
-       SCREENMODE_DYNAMIC = 0,
-       SCREENMODE_STANDARD,
-       SCREENMODE_NATURAL,
-       SCREENMODE_MOVIE,
-       SCREENMODE_MAX
-} screenmode_t;
-
-typedef enum {
-       DISPLAY_EXPAND_NONE = 0,
-       DISPLAY_EXPAND_BACKLIGHT,
-       DISPLAY_EXPAND_TOUCH_KEY_LIGHT_DURATION
-} ApplicationsExpandState;
-
-
-typedef struct _Ctxpopup_Data {
-       Evas_Object *ctx;
-       Evas_Object *btn;
-} Ctxpopup_Data;
-
-typedef enum {
-       SETTING_DISPLAY_VIEWTYPE_MAIN,
-       SETTING_DISPLAY_VIEWTYPE_BRIGHTNESS,
-       SETTING_DISPLAY_VIEWTYPE_BACKLIGHT,
-       SETTING_DISPLAY_VIEWTYPE_SMARTSCREEN,
-       SETTING_DISPLAY_VIEWTYPE_MAX,
-} applications_viewtype;
-
 typedef struct _SettingApplicationsUG SettingApplicationsUG;
 
-#define BRIGHTNESS_DISPLAY 0
-
 /**
  * Setting Applications UG context
  * all UG function has void* as an agument. this is casted back to
@@ -151,42 +91,11 @@ struct _SettingApplicationsUG {
 
        Setting_GenGroupItem_Data *data_home;
 
-       Setting_GenGroupItem_Data *data_screen_mode;
-       Setting_GenGroupItem_Data *data_br;
        Setting_GenGroupItem_Data *data_back;
-       Setting_GenGroupItem_Data *data_br_auto;
-       Setting_GenGroupItem_Data *data_br_sli;
-       Setting_GenGroupItem_Data *data_adjust;
-       Setting_GenGroupItem_Data *data_overheating;
-
-       Setting_GenGroupItem_Data *data_br_adjustment;
 
        Setting_GenGroupItem_Data *data_auto_rotate;
        Setting_GenGroupItem_Data *data_tts;
 
-       /* smart screen */
-       Setting_GenGroupItem_Data *data_smart_stay;
-       Setting_GenGroupItem_Data *data_smart_rotation;
-       Setting_GenGroupItem_Data *data_auto_adjust_scrn_tone;
-       Setting_GenGroupItem_Data *data_dynamic;
-
-
-       Evas_Object *more_popup;
-       Ctxpopup_Data ctx_data;
-
-       Setting_GenGroupItem_Data *tilting_head;
-       Setting_GenGroupItem_Data *tilting_device;
-       Setting_GenGroupItem_Data *smart_scroll_speed;
-       Setting_GenGroupItem_Data *visual_feedback_display;
-       Setting_GenGroupItem_Data *scroll_speed_slider;
-       Setting_GenGroupItem_Data *try_tilting_head;
-       Setting_GenGroupItem_Data *try_tilting_device;
-       Setting_GenGroupItem_Data *data_smart_screen_image;
-       Setting_GenGroupItem_Data *data_smart_screen_rotation_image;
-
-       /*int bright_value; */
-       int low_bat;
-
        setting_view *view_to_load;
 
        Evas_Object *popup_chk;
@@ -211,16 +120,6 @@ struct _SettingApplicationsUG {
        Elm_Genlist_Item_Class itc_multiline_overheating;
 
 
-       ui_gadget_h ug_gallery;
-       ui_gadget_h ug_imageviewer;
-       Eina_Bool isLoading;
-       Setting_GenGroupItem_Data *data_backlight_always_on;
-       Setting_GenGroupItem_Data *data_backlight_15sec;
-       Setting_GenGroupItem_Data *data_backlight_30sec;
-       Setting_GenGroupItem_Data *data_backlight_1min;
-       Setting_GenGroupItem_Data *data_backlight_2min;
-       Setting_GenGroupItem_Data *data_backlight_5min;
-       Setting_GenGroupItem_Data *data_backlight_10min;
        /*Improve response speed */
        Ecore_Idler *set_idler;
        Ecore_Timer *set_timer;
@@ -233,20 +132,12 @@ struct _SettingApplicationsUG {
 
        GList *pkg_list;
 
-       /*for brightness*/
-       Eina_Bool is_event_registered;
-       int last_requested_level;
-       applications_viewtype applications_viewtype;
-
        /*for smart screen try it*/
        Evas_Object *smart_stay_image;
        Evas_Object *smart_rotation_image;
        Evas_Object *smart_stay_sublayout;
        Evas_Object *smart_rotation_sublayout;
        Ecore_Timer *timer_show_guide;
-
-       ApplicationsExpandState applications_expand_state;
-
 };
 
 extern setting_view setting_view_applications_main;
@@ -265,10 +156,4 @@ typedef struct _default_app {
 void setting_applications_layout_ug_cb(
                ui_gadget_h ug, enum ug_mode mode, void *priv);
 
-Eina_Bool __show_smartstay_guide_popup(void *data);
-Eina_Bool __show_smartrotation_guide_popup(void *data);
-
-extern void destruct_brightness(void *data);
-extern void construct_brightness(void *data, Evas_Object *genlist);
-
-#endif                         /* __SETTING_DISPLAY_H__ */
+#endif                         /* __SETTING_APPLICATION_H__ */
index e9c194bc16676669657b54fdaf4a70bb9faefd5e..22d8e8ab97b2b747a45a157da8e7610bce192757 100644 (file)
@@ -198,7 +198,7 @@ void default_app_list_init(void *data, Evas_Object *genlist)
                                NULL, NULL,
                                SWALLOW_Type_INVALID, NULL,
                                NULL, 0,
-                               "There are no apps set as defaults.", NULL, NULL);
+                               MGRAPP_STR_DEFAULT_NO_APPS, NULL, NULL);
                elm_object_item_disabled_set(item->item, EINA_TRUE);
 
        } else {
@@ -218,7 +218,6 @@ void default_app_list_init(void *data, Evas_Object *genlist)
                                        ELM_GENLIST_ITEM_NONE,
                                        _unset_sel, ad);
                }
-
        }
        ad->pkg_list = pkg_list;
 }
index 715d5a6951b4e4afb63d5c14fa0414b6a00d4387..1ec816a4d5c427697e33896c98238805db478770 100644 (file)
@@ -40,30 +40,6 @@ setting_view setting_view_applications_main = {
  *
  ***************************************************/
 
-static UNUSED void setting_applications_main_vconf_change_cb(keynode_t *key,
-               void *data)
-{
-       ret_if(data == NULL);
-
-       SettingApplicationsUG *ad = data;
-       int status = 0;
-
-       status = vconf_keynode_get_bool(key);
-       char *vconf_name = vconf_keynode_get_name(key);
-       SETTING_TRACE("status:%d", status);
-
-       if (!safeStrCmp(vconf_name, VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL)) {
-               if (ad->data_back) {
-                       G_FREE(ad->data_back->sub_desc);
-                       ad->data_back->sub_desc =
-                                       get_pa_backlight_time_value_str();
-                       elm_object_item_data_set(ad->data_back->item,
-                                       ad->data_back);
-                       elm_genlist_item_update(ad->data_back->item);
-               }
-       }
-}
-
 static int setting_applications_main_create(void *cb)
 {
        SETTING_TRACE_BEGIN;
@@ -72,16 +48,16 @@ static int setting_applications_main_create(void *cb)
 
        SettingApplicationsUG *ad = (SettingApplicationsUG *)cb;
 
-       Evas_Object *scroller = NULL;
+       Evas_Object *genlist = NULL;
 
        ad->ly_main = setting_create_layout_navi_bar_genlist(
                        ad->win_main_layout, ad->win_get,
                        KeyStr_Applications, NULL,/* ARROW */
                        NULL,
                        (setting_call_back_func)setting_applications_main_click_softkey_back_cb,
-                       NULL, ad, &scroller, &(ad->navi_bar));
+                       NULL, ad, &genlist, &(ad->navi_bar));
 
-       ad->genlist = scroller;
+       ad->genlist = genlist;
        elm_genlist_mode_set(ad->genlist, ELM_LIST_COMPRESS);
        /*register vconf key */
 
@@ -131,7 +107,7 @@ static int setting_applications_main_update(void *cb)
        SETTING_TRACE_BEGIN;
        /* error check */
        retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
+/*
        SettingApplicationsUG *ad = (SettingApplicationsUG *)cb;
 
        if (ad->ly_main != NULL) {
@@ -145,7 +121,7 @@ static int setting_applications_main_update(void *cb)
 
                }
        }
-
+*/
        return SETTING_RETURN_SUCCESS;
 }
 
index 799bb12fb35cee0377a10d83326d417bcc07ec0c..9598de3a3e9e1ef72dc020ce80b49047a4b9f680 100644 (file)
@@ -68,7 +68,7 @@ static void setting_applications_ug_cb_resize(void *data, Evas *e,
        setting_view_update(ad->view_to_load, ad);
 }
 
-char *_main_gl_label_new_get(void *data, Evas_Object *obj,
+char *_gl_label_new_get(void *data, Evas_Object *obj,
                const char *part)
 {
        SETTING_TRACE_BEGIN;
@@ -84,7 +84,7 @@ char *_main_gl_label_new_get(void *data, Evas_Object *obj,
        return label;
 }
 
-char *appmgrUg_get_defualt_icon(pkgmgrinfo_appinfo_h handle)
+char *_get_defualt_icon(pkgmgrinfo_appinfo_h handle)
 {
        int ret;
        char *type;
@@ -109,7 +109,7 @@ char *appmgrUg_get_defualt_icon(pkgmgrinfo_appinfo_h handle)
 
        return strdup(icon);
 }
-static void clear_default_cb(void *data, Evas_Object *obj, void *event_info)
+static void _clear_default_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
        ret_if(data == NULL);
@@ -123,11 +123,10 @@ static void clear_default_cb(void *data, Evas_Object *obj, void *event_info)
        }
 
        elm_object_item_del(info->item);
-
 }
 
 
-Evas_Object *_info_1button1_gl_icon_get(void *data, Evas_Object *obj,
+Evas_Object *_gl_1button1_icon_get(void *data, Evas_Object *obj,
                const char *part)
 {
        SETTING_TRACE_BEGIN;
@@ -148,7 +147,7 @@ Evas_Object *_info_1button1_gl_icon_get(void *data, Evas_Object *obj,
                        warn_if(PMINFO_R_OK != ret, "pkgmgrinfo_appinfo_get_appinfo() Fail(%d)",
                                        ret);
 
-                       _icon = appmgrUg_get_defualt_icon(handle);
+                       _icon = _get_defualt_icon(handle);
 
                        SETTING_TRACE(" ==> appid [%s], icon [%s]", info->pkgid, _icon);
 
@@ -170,12 +169,12 @@ Evas_Object *_info_1button1_gl_icon_get(void *data, Evas_Object *obj,
 
                button = elm_button_add(obj);
                SETTING_TRACE_BEGIN;
-               elm_object_text_set(button, "Clear");
+               elm_object_text_set(button, Keystr_Clear);
                evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
                evas_object_size_hint_min_set(button, 160, 60);
                evas_object_size_hint_max_set(button, 160, 60);
                evas_object_show(button);
-               evas_object_smart_callback_add(button, "clicked", clear_default_cb, info);
+               evas_object_smart_callback_add(button, "clicked", _clear_default_cb, info);
 
                return button;
        } else
@@ -222,9 +221,9 @@ static void *setting_applications_ug_on_create(ui_gadget_h ug,
                        &(applicationsUG->itc_grp_title));
 
        applicationsUG->itc_1icon_1button.item_style = SETTING_GENLIST_2LINE_STYLE;
-       applicationsUG->itc_1icon_1button.func.text_get = _main_gl_label_new_get;
+       applicationsUG->itc_1icon_1button.func.text_get = _gl_label_new_get;
        applicationsUG->itc_1icon_1button.func.content_get =
-                       _info_1button1_gl_icon_get;
+                       _gl_1button1_icon_get;
        applicationsUG->itc_1icon_1button.func.state_get = NULL;
        applicationsUG->itc_1icon_1button.func.del = NULL;
 
index e2df7079f9457731242d1afc2d3981d265c25dfb..30c9758a591fecb992f5e0742c7140bb34505d03 100644 (file)
 #define MGRAPP_STR_DOWNLOADS "IDS_ST_BODY_DOWNLOADS"
 #define MGRAPP_STR_CLEAR_DEFAULT_APPS "IDS_ST_BUTTON_REMOVE_DEFAULT_APPS_ABB"
 #define MGRAPP_STR_CLEAR_DEFAULT_APPS_Q "IDS_ST_POP_REMOVE_DEFAULT_APPS_Q"
+#define MGRAPP_STR_CLEAR_DEFAULT_POPUP_TITLE "Clear default app settings"
+#define MGRAPP_STR_DEFAULT_CLEAR_TEXT "To clear default app settings, go to \
+       Settings > Apps > Default apps, then tap Clear"
+
 
 /*#define MGRAPP_STR_APP_MANAGER "IDS_ST_BODY_APPLICATION_MANAGER" */
 #define MGRAPP_STR_APP_MANAGER "IDS_ST_BODY_APPLICATION_MANAGER"
index 9e4a6b8041e8adea5440d514a762a5f977b8a28e..2851cd19536181333c49d46d4fcfa95489abb1d4 100644 (file)
@@ -25,9 +25,6 @@
 #include "setting-appmgr-utils.h"
 #include "setting-appmgr-pkginfo-utils.h"
 
-#define DEFAULT_CLEAR_TEXT "To clear default app settings, go to \
-       Settings > Apps > Default apps, then tap Clear"
-
 static int appmgrUg_pkg_get_privileges_help(const char *privilege,
                void *user_data)
 {
@@ -765,8 +762,8 @@ void appmgrUg_pkg_clear_default(void *data, Evas_Object *obj, void *event_info)
        ad->popup = setting_create_popup(
                        ad,
                        ad->win,
-                       "Clear default app settings",
-                       DEFAULT_CLEAR_TEXT,
+                       MGRAPP_STR_CLEAR_DEFAULT_POPUP_TITLE,
+                       MGRAPP_STR_DEFAULT_CLEAR_TEXT,
                        appmgrUg_pkg_clear_default_cb,
                        0,
                        FALSE,