[Call UI] Fix issue with showing dim layout in Incoming call view on reject message...

Change-Id: I543bd7ede3fa5b24f680c087fef9201b16a4a71e

diff --git a/edje_src/edc/call_edc/callui-view-incoming-lock.edc b/edje_src/edc/call_edc/callui-view-incoming-lock.edc
index afc77b1..4cf1c24 100644 (file)
--- a/edje_src/edc/call_edc/callui-view-incoming-lock.edc
+++ b/edje_src/edc/call_edc/callui-view-incoming-lock.edc
@@ -827,19 +827,5 @@ group { name: "lock_reject_with_msg";
        }
 }
 
-group {
-       name: "dimming_ly";
-       parts {
-               part {
-                       name: "background";
-                       type: RECT;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               color_class: "AO012";
-                               visible: 1;
-                       }
-               }
-       }
-}
-
+BG_IMAGE("incoming_call_bg_ly", IMG_SRC_DIR/"background.png")
+BG_IMAGE("incoming_call_bg_dim_ly", IMG_SRC_DIR/"background_dim.png")

diff --git a/edje_src/edc/call_edc/callui_view_incoming_active.edc b/edje_src/edc/call_edc/callui_view_incoming_active.edc
index c120492..54db524 100644 (file)
--- a/edje_src/edc/call_edc/callui_view_incoming_active.edc
+++ b/edje_src/edc/call_edc/callui_view_incoming_active.edc
@@ -72,6 +72,9 @@ styles {
        }
 }
 
+RESOURCE_IMAGE("call_end_ic_call", IMG_SRC_DIR/"call_end_ic_call.png");
+RESOURCE_IMAGE("call_end_ic_end", IMG_SRC_DIR/"call_end_ic_end.png");
+
 group { name: "reject_msg_item";
        parts {
                CU_PART_BASE_WH(AN_MAX_W, ACTIVE_NOTI_RM_ITEM_HEIGHT)

diff --git a/edje_src/edc/call_edc/edc_image_macro.edc b/edje_src/edc/call_edc/edc_image_macro.edc
index 5628a0a..6e56645 100644 (file)
--- a/edje_src/edc/call_edc/edc_image_macro.edc
+++ b/edje_src/edc/call_edc/edc_image_macro.edc
@@ -15,6 +15,21 @@
  *
  */
 
+#define BG_IMAGE( GROUP_NAME, FILE_NAME ) \
+   group { \
+      name: GROUP_NAME; \
+      images.image: FILE_NAME COMP; \
+      parts { \
+         part { name: "image"; \
+            description { \
+               state: "default" 0.0; \
+               image.normal: FILE_NAME; \
+               aspect: 1 1; \
+            } \
+         } \
+      } \
+   }
+
 #define RESOURCE_IMAGE( GROUP_NAME, FILE_NAME ) \
    group { \
       name: GROUP_NAME; \

diff --git a/res/edje/call.edc b/res/edje/call.edc
index a96e5c6..996c39b 100644 (file)
--- a/res/edje/call.edc
+++ b/res/edje/call.edc
@@ -36,9 +36,6 @@ collections {
                }
        }
 
-       RESOURCE_IMAGE("call_end_ic_call", IMG_SRC_DIR/"call_end_ic_call.png");
-       RESOURCE_IMAGE("call_end_ic_end", IMG_SRC_DIR/"call_end_ic_end.png");
-
        #include "../../edje_src/edc/call_edc/callui_view_end_call.edc"
        #include "../../edje_src/edc/call_edc/callui-view-button-layout.edc"
        #include "../../edje_src/edc/call_edc/callui-view-incoming-lock.edc"

diff --git a/src/callui-view-incoming-call.c b/src/callui-view-incoming-call.c
index 4846d97..2106600 100644 (file)
--- a/src/callui-view-incoming-call.c
+++ b/src/callui-view-incoming-call.c
@@ -30,8 +30,8 @@
 #include "callui-sound-manager.h"
 
 #define CALLUI_GROUP_LOCK_REJECT_WITH_MSG      "lock_reject_with_msg"
-#define CALLUI_GROUP_DIMMING_LAYOUT                    "dimming_ly"
-
+#define CALLUI_GROUP_BG_DIM_LAYOUT                     "incoming_call_bg_dim_ly"
+#define CALLUI_GROUP_BG_LAYOUT                         "incoming_call_bg_ly"
 #define CALLUI_REJ_MSG_GENLIST_DATA                    "reject_msg_genlist_data"
 #define CALLUI_REJ_MSG_LIST_OPEN_STATUS_KEY    "list_open_status_key"
 
@@ -72,7 +72,7 @@ static callui_result_e __create_main_content(callui_view_incoming_call_h vd, Eva
 static callui_result_e __update_displayed_data(callui_view_incoming_call_h vd);
 
 static char *__callui_view_incoming_call_reject_msg_gl_label_get_msg(void *data, Evas_Object *obj, const char *part);
-static void __reject_msg_gl_sel_msg(void *data, Evas_Object *obj, void *event_info);
+static void __reject_msg_gl_sel_msg_cb(void *data, Evas_Object *obj, void *event_info);
 
 static void __reject_msg_genlist_create(callui_view_incoming_call_h vd);
 static void __reject_msg_genlist_init_item_class(callui_view_incoming_call_h vd);
@@ -190,7 +190,7 @@ static char *__callui_view_incoming_call_reject_msg_gl_label_get_msg(void *data,
        return NULL;
 }
 
-static void __reject_msg_gl_sel_msg(void *data, Evas_Object *obj, void *event_info)
+static void __reject_msg_gl_sel_msg_cb(void *data, Evas_Object *obj, void *event_info)
 {
        int index = SAFE_C_CAST(int, data);
        dbg("index: %d", index);
@@ -225,7 +225,13 @@ static void __reject_msg_genlist_create(callui_view_incoming_call_h vd)
 {
        DELETE_EVAS_OBJECT(vd->reject_msg_genlist);
 
-       vd->reject_msg_genlist = elm_genlist_add(vd->reject_msg_layout);
+       Evas_Object *ly = elm_layout_add(vd->reject_msg_layout);
+       elm_layout_theme_set(ly, "layout", "application", "default");
+
+       Evas_Object *bg = elm_layout_add(ly);
+       elm_bg_file_set(bg, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_BG_LAYOUT);
+
+       vd->reject_msg_genlist = elm_genlist_add(ly);
        elm_genlist_homogeneous_set(vd->reject_msg_genlist, EINA_TRUE);
        elm_genlist_mode_set(vd->reject_msg_genlist, ELM_LIST_COMPRESS);
        elm_scroller_content_min_limit(vd->reject_msg_genlist, EINA_FALSE, EINA_TRUE);
@@ -234,7 +240,11 @@ static void __reject_msg_genlist_create(callui_view_incoming_call_h vd)
        evas_object_data_set(vd->reject_msg_genlist, CALLUI_REJ_MSG_GENLIST_DATA, vd);
        evas_object_size_hint_weight_set(vd->reject_msg_genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(vd->reject_msg_genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       elm_object_part_content_set(vd->reject_msg_layout, "swl_msglist", vd->reject_msg_genlist);
+
+       elm_object_part_content_set(ly, "elm.swallow.bg", bg);
+       elm_object_part_content_set(ly, "elm.swallow.content", vd->reject_msg_genlist);
+
+       elm_object_part_content_set(vd->reject_msg_layout, "swl_msglist", ly);
 }
 
 static void __reject_msg_genlist_init_item_class(callui_view_incoming_call_h vd)
@@ -261,7 +271,7 @@ static Elm_Object_Item *__reject_msg_genlist_append_item(Evas_Object *msg_glist,
        Elm_Object_Item *item = NULL;
        item = elm_genlist_item_append(msg_glist, itc_reject_msg,
                        SAFE_C_CAST(void *, index), NULL, ELM_GENLIST_ITEM_NONE,
-                       __reject_msg_gl_sel_msg, SAFE_C_CAST(void *, index));
+                       __reject_msg_gl_sel_msg_cb, SAFE_C_CAST(void *, index));
        return item;
 }
 
@@ -335,7 +345,6 @@ static void __reject_screen_transit_complete_cb(void *data, Elm_Transit *transit
        } else {
                elm_object_tree_focus_allow_set(vd->reject_msg_genlist, EINA_TRUE);
                elm_object_signal_emit(vd->reject_msg_layout, "show-down-arrow", "reject_msg");
-               evas_object_show(vd->dimming_ly);
        }
        __reject_msg_list_param_reset(vd);
 }
@@ -613,6 +622,7 @@ static void __reject_msg_bg_mouse_move_cb(void *data, Evas *evas, Evas_Object *o
                if ((diff_y > -max_height_limit) && (diff_y <= 0)) {
                        /*Lies between 0 and msg-list layout height*/
                        evas_object_move(vd->reject_msg_layout, 0, diff_y);
+                       evas_object_show(vd->dimming_ly);
                } else if (diff_y <= -max_height_limit) {
                        /*Special case - Move the max distance - msg-list height*/
                        evas_object_move(vd->reject_msg_layout, 0, -max_height_limit);
@@ -801,7 +811,7 @@ static callui_result_e __create_main_content(callui_view_incoming_call_h vd, Eva
        res = _callui_view_circle_create_reject_layout(ad, vd, vd->base_view.contents);
        CALLUI_RETURN_VALUE_IF_FAIL(res == CALLUI_RESULT_OK, res);
 
-       vd->dimming_ly = _callui_load_edj(vd->base_view.contents, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_DIMMING_LAYOUT);
+       vd->dimming_ly = _callui_load_edj(vd->base_view.contents, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_BG_DIM_LAYOUT);
        CALLUI_RETURN_VALUE_IF_FAIL(vd->dimming_ly, CALLUI_RESULT_ALLOCATION_FAIL);
        evas_object_resize(vd->dimming_ly, ad->root_w, ad->root_h);
        evas_object_move(vd->dimming_ly, 0, 0);