TSAM-12470[SE][Ref.App][Tizen_3.0_Public_M2_RC10][Mobile][Phone][UIT] Unable to compo... 35/109035/3 tizen_3.0 submit/tizen_3.0/20170106.134854
authorIgor Olshevskyi <i.olshevskyi@samsung.com>
Fri, 6 Jan 2017 13:34:37 +0000 (15:34 +0200)
committerIgor Olshevskyi <i.olshevskyi@samsung.com>
Fri, 6 Jan 2017 13:45:10 +0000 (15:45 +0200)
Change-Id: Iac8f96830ab47d7560f5d0010ca4fcc6bbc24aaa

edje_src/edc/callui-view-incoming-call.edc
edje_src/images/core_theme_bg.png [new file with mode: 0644]
src/callui-view-incoming-call.c

index 4ba7fe0..9e97024 100644 (file)
@@ -223,6 +223,28 @@ group {
        }
 }
 
+group { name: "elm/layout/callui/lock_reject_gl_ly";
+       images {
+               image: "core_theme_bg.png" COMP;
+       }
+       parts {
+               part { name: "bg";
+                       type: IMAGE;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               image.normal: "core_theme_bg.png";
+                               fill.type: TILE;
+                       }
+               }
+               part { name: "swl_content";
+                       type: SWALLOW;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                       }
+               }
+       }
+}
+
 group { name: "elm/layout/callui/lock_reject_with_msg";
        images {
                image: "call_inline_btn_open.png" COMP;
diff --git a/edje_src/images/core_theme_bg.png b/edje_src/images/core_theme_bg.png
new file mode 100644 (file)
index 0000000..477402f
Binary files /dev/null and b/edje_src/images/core_theme_bg.png differ
index 830c6db..1501476 100644 (file)
@@ -229,21 +229,20 @@ static void __reject_msg_genlist_create(callui_view_incoming_call_h vd)
 {
        DELETE_EVAS_OBJECT(vd->rm_genlist);
 
-       Evas_Object *ly = elm_layout_add(vd->rm_ly);
-       elm_layout_theme_set(ly, "layout", "application", "default");
+       Evas_Object *ly = _callui_create_layout(vd->rm_ly, "lock_reject_gl_ly");
+       CALLUI_RETURN_IF_FAIL(ly);
 
        vd->rm_genlist = elm_genlist_add(ly);
+       CALLUI_RETURN_IF_FAIL(vd->rm_genlist);
        elm_genlist_homogeneous_set(vd->rm_genlist, EINA_TRUE);
        elm_genlist_mode_set(vd->rm_genlist, ELM_LIST_COMPRESS);
        elm_scroller_content_min_limit(vd->rm_genlist, EINA_FALSE, EINA_TRUE);
-       CALLUI_RETURN_IF_FAIL(vd->rm_genlist);
 
        evas_object_data_set(vd->rm_genlist, CALLUI_RM_GL_DATA, vd);
        evas_object_size_hint_weight_set(vd->rm_genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(vd->rm_genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-       elm_object_part_content_set(ly, "elm.swallow.bg", _callui_create_layout(ly, CALLUI_LY_BG_DIM));
-       elm_object_part_content_set(ly, "elm.swallow.content", vd->rm_genlist);
+       elm_object_part_content_set(ly, "swl_content", vd->rm_genlist);
 
        elm_object_part_content_set(vd->rm_ly, "swl_msglist", ly);
 }
@@ -721,7 +720,7 @@ static void __create_reject_msg_genlist(callui_view_incoming_call_h vd)
 
        __reject_msg_list_height_update(vd);
 
-       if (msg_cnt > 0) {
+       if (msg_cnt >= 0) {
                if (msg_cnt < 2)
                        elm_object_signal_emit(vd->rm_ly, "set_1item_list", "");
                else if (msg_cnt <= CALLUI_REJ_MSG_MAX_COUNT) {