TizenRefApp-6038 Contact Image not Displayed in Active Call Notification

Change-Id: I0d1b8b6c1d04caffe5a4791c624fe1c6ae0f7116

diff --git a/res/edje_src/edc/call_edc/callui_view_incoming_active.edc b/res/edje_src/edc/call_edc/callui_view_incoming_active.edc
index ae4a498..58a0cad 100644 (file)
--- a/res/edje_src/edc/call_edc/callui_view_incoming_active.edc
+++ b/res/edje_src/edc/call_edc/callui_view_incoming_active.edc
@@ -249,11 +249,8 @@ group {
                        scale: 1;
                        description { state: "default" 0.0;
                                visible: 0;
-                               aspect: 1 1;
-                               aspect_preference: BOTH;
                                rel1 { relative: IAC_CONTACT_IMG_X0 IAC_CONTACT_IMG_Y0; to: "bg";}
                                rel2 { relative: IAC_CONTACT_IMG_X1 IAC_CONTACT_IMG_Y1; to: "bg";}
-                               color: 255 255 0 255;
                        }
                        description { state: "show" 0.0;
                                inherit: "default" 0.0;
@@ -455,20 +452,32 @@ group {
 
        programs{
                program {
-                       name: "show_image";
-                       signal: "show_image";
+                       name: "show_caller_id";
+                       action: STATE_SET "show" 0.0;
+                       target: "caller_id";
+               }
+               program {
+                       name: "hide_caller_id";
+                       action: STATE_SET "hide" 0.0;
+                       target: "caller_id";
+               }
+               program {
+                       name: "show_def_caller_id";
+                       signal: "show_def_caller_id";
                        source: "main_active_noti_call";
                        action: STATE_SET "show" 0.0;
                        target: "caller_id_mask";
                        target: "caller_id_default";
+                       after: "hide_caller_id";
                }
                program {
-                       name: "hide_image";
-                       signal: "hide_image";
+                       name: "hide_def_caller_id";
+                       signal: "hide_def_caller_id";
                        source: "main_active_noti_call";
                        action: STATE_SET "hide" 0.0;
                        target: "caller_id_mask";
                        target: "caller_id_default";
+                       after: "show_caller_id";
                }
                program {
                        name: "small_main_ly";

diff --git a/src/callui-view-incoming-call-noti.c b/src/callui-view-incoming-call-noti.c
index 7974fad..76b8e10 100644 (file)
--- a/src/callui-view-incoming-call-noti.c
+++ b/src/callui-view-incoming-call-noti.c
@@ -459,9 +459,11 @@ static callui_result_e __update_displayed_data(callui_view_incoming_call_noti_h
        }
 
        if (strcmp(file_path, "default") != 0) {
-               _callui_show_caller_id(vd->base_view.contents, file_path);
+               Evas_Object *layout = _callui_create_thumbnail(vd->base_view.contents, file_path, THUMBNAIL_98);
+               elm_object_part_content_set(vd->base_view.contents, "caller_id", layout);
+               elm_object_signal_emit(vd->base_view.contents, "hide_def_caller_id", "main_active_noti_call");
        } else {
-               elm_object_signal_emit(vd->base_view.contents, "show_image", "main_active_noti_call");
+               elm_object_signal_emit(vd->base_view.contents, "show_def_caller_id", "main_active_noti_call");
        }
 
        evas_object_show(vd->base_view.contents);