Sync with Tizen 3.0 setting mobile (2)

    * Fix a problem, "Main Menu is not updated after language change" (If5b43ffe86e6201af19a7b1ca524c4fdba1be8f2)
    * Fix Storage Capacity of video, music and miscellaneous (I5876b828e3ad0a16cf8997d5e76caf4fdbfc5c36)
    * Remove unused style definition (Ia26c8ea2efee13b817873de3d40e2894e850c29c)
    * Enable some ugs rotation (ee6389ce6636d1346440a80e05a8ccf92ba2d81f)

Change-Id: Ic86d3b6d49d1439528de3c83c7bad425b8a9f934
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>

diff --git a/setting-common/include/setting-common-draw-widget.h b/setting-common/include/setting-common-draw-widget.h
index ac30850ce51756e99fcccf1a557d176c7e09c645..78f539a86f64d07d4bbc7061ed08912b9b3c6ff4 100644 (file)
--- a/setting-common/include/setting-common-draw-widget.h
+++ b/setting-common/include/setting-common-draw-widget.h
@@ -43,8 +43,6 @@
 #define SETTING_COMMON_DRAW_WIDGET_CONTROLBAR_ITEM_LEN 3
 #define POPUP_INTERVAL 2.0
 
-extern const Elm_Genlist_Item_Class itc_seperator;
-
 extern const Elm_Genlist_Item_Class itc_1text;
 extern const Elm_Genlist_Item_Class itc_1text_1icon_2;
 extern const Elm_Genlist_Item_Class itc_1text_1icon_2_tb;

diff --git a/setting-font/src/setting-font-font-size.c b/setting-font/src/setting-font-font-size.c
index b7628cfe2892efcc1a5e72b1befe84399c4f2e90..59db69ec247411f2a3aa3d97ecb24c67371d6d5e 100644 (file)
--- a/setting-font/src/setting-font-font-size.c
+++ b/setting-font/src/setting-font-font-size.c
@@ -125,12 +125,6 @@ static int setting_font_font_size_create(void *cb)
                                                                                                                                         ad, &scroller, ad->navibar);
        }
 
-       /* [UI] separator */
-       Elm_Object_Item *item =
-               elm_genlist_item_append(scroller, &itc_seperator, NULL, NULL,
-                                                               ELM_GENLIST_ITEM_NONE, NULL, NULL);
-       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
        /* [UI] create the font list */
        ad->size_rdg = elm_radio_add(scroller);
        elm_radio_state_value_set(ad->size_rdg, -1);

diff --git a/setting-phone/include/setting-phone.h b/setting-phone/include/setting-phone.h
index c1508514a0e5bcba1a7a4ae11da62108f6208ad8..53a4457928dee7350338cb6a3c0666ec4ee2dfe3 100644 (file)
--- a/setting-phone/include/setting-phone.h
+++ b/setting-phone/include/setting-phone.h
@@ -182,6 +182,8 @@ struct _SettingPhoneUG {
 
        char *selected_locale;
        char *region_search_id;
+
+       int current_rotation;
 };
 
 /* extern setting_view setting_view_phone_main; */

diff --git a/setting-phone/src/setting-phone.c b/setting-phone/src/setting-phone.c
index b0e52234470bd449913853b8f3887ea9064a2294..66b07d732146bf1186c9a485aea187a56bf0ebb7 100644 (file)
--- a/setting-phone/src/setting-phone.c
+++ b/setting-phone/src/setting-phone.c
@@ -514,6 +514,55 @@ static void setting_phone_ug_cb_resize(void *data, Evas *e, Evas_Object *obj,
        setting_view_update(ad->view_to_load, ad);
 }
 
+
+#if SUPPORT_APP_ROATION
+static void _rot_changed_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       SETTING_TRACE_BEGIN;
+       SettingPhoneUG *phoneUG = (SettingPhoneUG *)data;
+       if (phoneUG  == NULL || phoneUG ->win_get == NULL) {
+               return;
+       }
+       int change_ang = elm_win_rotation_get(phoneUG->win_get);
+       SETTING_TRACE_DEBUG("....change_ang:%d", change_ang);
+       SETTING_TRACE_DEBUG("current_rotation:%d", phoneUG->current_rotation);
+       /*Send the rotation event to UGs.. */
+       enum ug_event event = UG_EVENT_ROTATE_PORTRAIT;
+       switch (change_ang) {
+       case APP_DEVICE_ORIENTATION_0:
+               event = UG_EVENT_ROTATE_PORTRAIT;
+               break;
+       case APP_DEVICE_ORIENTATION_180:
+               event = UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN;
+               break;
+       case APP_DEVICE_ORIENTATION_270:
+               event = UG_EVENT_ROTATE_LANDSCAPE;
+               break;
+       case APP_DEVICE_ORIENTATION_90:
+               event = UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN;
+               break;
+       default:
+               return;
+       }
+       SETTING_TRACE_DEBUG("diff:%d", elm_win_rotation_get(phoneUG->win_get) - phoneUG->current_rotation);
+
+       if (change_ang != phoneUG->current_rotation) {
+               int diff = change_ang - phoneUG->current_rotation;
+               if (diff < 0) {
+                       diff = -diff;
+               }
+               /**
+               * @todo if app didn't launch UG, is the call required to invoke?
+               */
+               ug_send_event(event);
+               if (diff == 180) {
+                       /* do nothing */
+               }
+               phoneUG->current_rotation = change_ang;
+       }
+}
+#endif
+
 static void *setting_phone_ug_on_create(ui_gadget_h ug, enum ug_mode mode,
                                                                                app_control_h service, void *priv)
 {
@@ -530,6 +579,18 @@ static void *setting_phone_ug_on_create(ui_gadget_h ug, enum ug_mode mode,
        setting_retvm_if(phoneUG->win_main_layout == NULL, NULL,
                                         "cannot get main window ");
 
+
+
+
+       phoneUG->current_rotation = elm_win_rotation_get(phoneUG->win_get);
+       SETTING_TRACE_DEBUG("ad->current_rotation:%d", phoneUG->current_rotation);
+       if (elm_win_wm_rotation_supported_get(phoneUG->win_get)) {
+               int rots[4] = { 0, 90, 180, 270 };      /* rotation value that app may want */
+               elm_win_wm_rotation_available_rotations_set(phoneUG->win_get, rots, 4);
+       }
+       evas_object_smart_callback_add(phoneUG->win_get, "wm,rotation,changed", _rot_changed_cb, phoneUG);
+
+
        /* --------------------------------------------------------- */
        char *pa_path = NULL;;
 

diff --git a/setting-storage/include/setting-storage.h b/setting-storage/include/setting-storage.h
index df47de31307098c94b94b467a2364ca82ea859ed..97d2e6e91af94cc63d5d9aae02084b8b3b45d5a3 100644 (file)
--- a/setting-storage/include/setting-storage.h
+++ b/setting-storage/include/setting-storage.h
@@ -171,6 +171,8 @@ struct _SettingStorageUG {
        Evas_Object *title_right_btn;
 
        int mmc_status;
+
+       int current_rotation;
 };
 
 #endif /*__SETTING_STORAGE_H__ */

diff --git a/setting-storage/src/setting-storage-utils.c b/setting-storage/src/setting-storage-utils.c
index 2f007def6d717f89fae452c01937b5f04871ac57..77b8da2d2bdceefe3ccffadd281651bee7ea3c59 100644 (file)
--- a/setting-storage/src/setting-storage-utils.c
+++ b/setting-storage/src/setting-storage-utils.c
@@ -343,7 +343,7 @@ int storageUg_get_internal_detail(SettingStorageUG *ad)
 {
        int ret;
        const char *cond;
-       char cond_str[1024];
+       const char *cond_misc;
        struct _calculated_sizes sizes = {0.0, 0.0, 0.0};
 
        retv_if(NULL == ad, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
@@ -351,16 +351,14 @@ int storageUg_get_internal_detail(SettingStorageUG *ad)
        storageUG_STOP_POINT;
 
        /*0-image, 1-video, 2-sound, 3-music, 4-other*/
-       cond = "(MEDIA_TYPE < 4) and MEDIA_PATH LIKE \'/opt/usr/%%\'";
+       cond = "((MEDIA_TYPE < 4) AND (MEDIA_STORAGE_TYPE=0))";
        ret = storageUG_get_media_info(cond, storageUg_get_media_item, &sizes);
        warn_if(MEDIA_CONTENT_ERROR_NONE != ret, "storageUG_get_media_info() Fail(%d)", ret);
 
        storageUG_STOP_POINT;
 
-       snprintf(cond_str, 1024, "(MEDIA_TYPE = 4) and MEDIA_PATH LIKE \'%s/%%\'", tzplatform_getenv(TZ_USER_CONTENT));
-       /*cond = "(MEDIA_TYPE = 4) and MEDIA_PATH LIKE \'"_TZ_USER_CONTENT"/%%\'"; */
-       /*ret = storageUG_get_media_info(cond, storageUg_get_misces_item, &sizes); */
-       ret = storageUG_get_media_info(cond_str, storageUg_get_misces_item, &sizes);
+       cond_misc = "((MEDIA_TYPE=4) AND (MEDIA_STORAGE_TYPE=0))";
+       ret = storageUG_get_media_info(cond_misc, storageUg_get_misces_item, &sizes);
        warn_if(MEDIA_CONTENT_ERROR_NONE != ret, "storageUG_get_media_info() Fail(%d)", ret);
 
        storageUG_STOP_POINT;
@@ -394,7 +392,7 @@ void storageUG_update_cache_info(SettingStorageUG *ad)
        warn_if(ret, "pkgmgr_client_get_total_package_size_info() Fail(%d)", ret);
 }
 
-static int storageUg_get_apps_info(int req_id, const char *pkg_type,
+static int storageUg_get_apps_info(uid_t target_uid, int req_id, const char *pkg_type,
                                                                   const char *pkgid, const char *key, const char *val, const void *pmsg, void *data)
 {
        SettingStorageUG *ad = data;
@@ -425,7 +423,7 @@ void storageUG_update_apps_info(SettingStorageUG *ad)
                return;
        }
 
-       ret = pkgmgr_client_get_size(ad->pc, "get", PM_GET_ALL_PKGS, storageUg_get_apps_info,
+       ret = pkgmgr_client_get_size(ad->pc, "get", PM_GET_ALL_PKGS, &storageUg_get_apps_info,
                                                                 ad);
        warn_if(ret, "pkgmgr_client_get_size() Fail(%d)", ret);
 }

diff --git a/setting-storage/src/setting-storage.c b/setting-storage/src/setting-storage.c
index f7d80983bfb56ea5581f17572dca31fe77fcfe40..6b43017ce9b56ffb556567997469805f42e8177b 100644 (file)
--- a/setting-storage/src/setting-storage.c
+++ b/setting-storage/src/setting-storage.c
@@ -199,6 +199,58 @@ static inline void storageUg_move_view(STORAGEUG_KEYWORD keynum,
        }
 }
 
+
+
+
+#if SUPPORT_APP_ROATION
+static void _rot_changed_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       SETTING_TRACE_BEGIN;
+       SettingStorageUG *ad = (SettingStorageUG *)data;
+       if (ad == NULL || ad->win == NULL) {
+               return;
+       }
+       int change_ang = elm_win_rotation_get(ad->win);
+       SETTING_TRACE_DEBUG("....change_ang:%d", change_ang);
+       SETTING_TRACE_DEBUG("current_rotation:%d", ad->current_rotation);
+       /*Send the rotation event to UGs.. */
+       enum ug_event event = UG_EVENT_ROTATE_PORTRAIT;
+       switch (change_ang) {
+       case APP_DEVICE_ORIENTATION_0:
+               event = UG_EVENT_ROTATE_PORTRAIT;
+               break;
+       case APP_DEVICE_ORIENTATION_180:
+               event = UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN;
+               break;
+       case APP_DEVICE_ORIENTATION_270:
+               event = UG_EVENT_ROTATE_LANDSCAPE;
+               break;
+       case APP_DEVICE_ORIENTATION_90:
+               event = UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN;
+               break;
+       default:
+               return;
+       }
+       SETTING_TRACE_DEBUG("diff:%d", elm_win_rotation_get(ad->win) - ad->current_rotation);
+
+       if (change_ang != ad->current_rotation) {
+               int diff = change_ang - ad->current_rotation;
+               if (diff < 0) {
+                       diff = -diff;
+               }
+               /**
+               * @todo if app didn't launch UG, is the call required to invoke?
+               */
+               ug_send_event(event);
+               if (diff == 180) {
+                       /* do nothing */
+               }
+               ad->current_rotation = change_ang;
+       }
+}
+#endif
+
+
 static void *setting_storageUg_on_create(ui_gadget_h ug, enum ug_mode mode,
                                                                                 app_control_h service, void *priv)
 {
@@ -223,6 +275,20 @@ static void *setting_storageUg_on_create(ui_gadget_h ug, enum ug_mode mode,
                return NULL;
        }
 
+
+
+       ad->current_rotation = elm_win_rotation_get(ad->win);
+       SETTING_TRACE_DEBUG("ad->current_rotation:%d", ad->current_rotation);
+       if (elm_win_wm_rotation_supported_get(ad->win)) {
+               int rots[4] = { 0, 90, 180, 270 };      /* rotation value that app may want */
+               elm_win_wm_rotation_available_rotations_set(ad->win, rots, 4);
+       }
+       evas_object_smart_callback_add(ad->win, "wm,rotation,changed", _rot_changed_cb, ad);
+
+
+
+
+
        ret = media_content_connect();
        if (MEDIA_CONTENT_ERROR_NONE != ret) {
                SETTING_TRACE_ERROR("media_content_connect() Fail(%d)", ret);

diff --git a/src/setting.c b/src/setting.c
index 0d79922e4ca49d615356138d57aa03b3bdecd0c6..091c15ed4beac7da4ba002a4ca1a9f56a1c28d9b 100644 (file)
--- a/src/setting.c
+++ b/src/setting.c
@@ -213,7 +213,7 @@ static void setting_main_lang_changed_cb(app_event_info_h event_info, void *data
        setting_main_appdata *ad = g_main_ad;
 
        elm_object_item_part_text_set(ad->navibar_main_it, "elm.text.title", _("IDS_ST_OPT_SETTINGS"));
-       /*setting_navi_items_update(ad->navibar_main); */
+       elm_genlist_realized_items_update(ad->sc_gl[SC_All_List]);
 
        char *localeLanguage = NULL;
        system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &localeLanguage);