[TSAM-3374] Lack of icon of apps in application manager

Change-Id: Ie38e3c3322ef8525759928b7872692754922f73d
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/setting-appmgr/src/setting-appmgr-main.c b/setting-appmgr/src/setting-appmgr-main.c
index 619fdb687b73f5245a3cedea2fc73df80eb76058..a87f7b3ee87a15d94598260d22e3cfef8c94834f 100644 (file)
--- a/setting-appmgr/src/setting-appmgr-main.c
+++ b/setting-appmgr/src/setting-appmgr-main.c
@@ -398,8 +398,6 @@ char *appmgrUg_main_gl_label_new_get(void *data, Evas_Object *obj, const char *p
 
 static inline char *appmgrUg_get_listinfo_default_icon(const char *appid)
 {
-
-       
        int ret;
        char *icon;
        pkgmgrinfo_appinfo_h handle = NULL;
@@ -428,22 +426,17 @@ Evas_Object *appmgrUg_main_gl_icon_new_get(void *data, Evas_Object *obj, const c
        retv_if(data == NULL, NULL);
 
        if (!safeStrCmp(part, "elm.swallow.icon")) {
-               icon = elm_icon_add(obj);
 
                SETTING_TRACE(" -------> info->icon_path : %s",info->icon_path);
 
                if (NULL == info->icon_path)
                        info->icon_path = appmgrUg_get_listinfo_default_icon(info->mainappid);
 
+               icon = elm_icon_add(obj);
                elm_image_file_set(icon, info->icon_path, NULL);
                elm_image_resizable_set(icon, EINA_TRUE, EINA_TRUE);
-               
-               evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-               
+               evas_object_size_hint_min_set(icon, SETTING_APP_MGR_ICON_SIZE, SETTING_APP_MGR_ICON_SIZE);
 #if 1
-               evas_object_show(icon);
                return icon;
 #else
                Evas_Object *lay = NULL;

diff --git a/setting-appmgr/src/setting-appmgr.c b/setting-appmgr/src/setting-appmgr.c
index 2ea142d034d01dd51015bfbbaa729bc35976d02b..b16abdf1ae2b72cfe230a79fbbd99709aae022d5 100644 (file)
--- a/setting-appmgr/src/setting-appmgr.c
+++ b/setting-appmgr/src/setting-appmgr.c
@@ -187,8 +187,6 @@ static void *appmgrUg_on_create(ui_gadget_h ug, enum ug_mode mode,
 
        appmgrUg_init_itcs(ad);
 
-       /*elm_theme_extension_add(NULL, SETTING_THEME_EDJ_NAME); */
-
        ad->lo_main = setting_create_win_layout(ad->win);
        ad->navi = appmgrUg_create_navi(ad->lo_main, ad);
        if (NULL == ad->navi) {

diff --git a/setting-common/include/setting-common-data-type.h b/setting-common/include/setting-common-data-type.h
index 61faad4f65505366de53399a879d242419e76a1e..260d113b6a1d0a8e3e2ab837121a24cf83b3611d 100644 (file)
--- a/setting-common/include/setting-common-data-type.h
+++ b/setting-common/include/setting-common-data-type.h
@@ -77,6 +77,8 @@
 #define SETTING_ICON_PATH      _TZ_SYS_RO_APP"/org.tizen.setting/res/icons"
 #define SETTING_UG_ICON_PATH   _TZ_SYS_RO_UG"/res/icon/org.tizen.setting"
 
+#define SETTING_APP_MGR_ICON_SIZE      117
+
 #define SETTING_UG_PATH                _TZ_SYS_RO_UG"/lib"
 #define SETTING_UG_PATH_USR    _TZ_SYS_RO_UG"/lib"