TizenRefApp-7156 [Call UI] Fix issues with press effects on keypad and end call reply...

Change-Id: I895dc5d20d1fc2240467a42cef10bb6da5334164

diff --git a/edje_src/edc/call_edc/callui-keypad.edc b/edje_src/edc/call_edc/callui-keypad.edc
index 61ac19e..a211f06 100644 (file)
--- a/edje_src/edc/call_edc/callui-keypad.edc
+++ b/edje_src/edc/call_edc/callui-keypad.edc
@@ -25,21 +25,25 @@
                        CU_PART_RECT( txt, \
                                mouse_events: 1; \
                                description { state: "default" 0.0; \
-                                       visible: 1; \
                                        rel1 { relative: (column*(KEYPAD_EACH_BTN_W+KEYPAD_DIVIDER_SIZE)/MAIN_SCREEN_W) (row*(KEYPAD_EACH_BTN_H+KEYPAD_DIVIDER_SIZE)/KEYPAD_H); to:"keypad_btns_rect";} \
                                        rel2 { relative: (((column+1)*KEYPAD_EACH_BTN_W+column*KEYPAD_DIVIDER_SIZE)/MAIN_SCREEN_W) (((row+1)*KEYPAD_EACH_BTN_H+row*KEYPAD_DIVIDER_SIZE)/KEYPAD_H); to:"keypad_btns_rect"; } \
                                        fixed: 1 1; \
                                        color_class: "keypad_btn_bg_norm"; \
                                } \
+                       ) \
+                       CU_PART_RECT( txt"_press", \
+                               mouse_events: 1; \
+                               description { state: "default" 0.0; \
+                                       visible: 0; \
+                                       rel1 { relative: 0.0 0.0; to: txt;} \
+                                       rel2 { relative: 1.0 1.0; to: txt;} \
+                                       fixed: 1 1; \
+                               } \
                                description { state: "pressed" 0.0; \
                                        inherit: "default" 0.0; \
                                        visible: 1; \
                                        color_class: "keypad_btn_bg_press"; \
                                } \
-                               description { state: "hide" 0.0; \
-                                       inherit: "default" 0.0; \
-                                       visible: 0; \
-                               } \
                        ) \
                        CU_PART_IMAGE( txt"_left", \
                                mouse_events: 0; \
@@ -74,21 +78,25 @@
                        CU_PART_RECT( txt, \
                                mouse_events: 1; \
                                description { state: "default" 0.0; \
-                                       visible: 1; \
                                        rel1 { relative: (column*(KEYPAD_EACH_BTN_W+KEYPAD_DIVIDER_SIZE)/MAIN_SCREEN_W) (row*(KEYPAD_EACH_BTN_H+KEYPAD_DIVIDER_SIZE)/KEYPAD_H); to:"keypad_btns_rect";} \
                                        rel2 { relative: (((column+1)*KEYPAD_EACH_BTN_W+column*KEYPAD_DIVIDER_SIZE)/MAIN_SCREEN_W) (((row+1)*KEYPAD_EACH_BTN_H+row*KEYPAD_DIVIDER_SIZE)/KEYPAD_H); to:"keypad_btns_rect"; } \
                                        fixed: 1 1; \
                                        color_class: "keypad_btn_bg_norm"; \
                                } \
+                       ) \
+                       CU_PART_RECT( txt"_press", \
+                               mouse_events: 1; \
+                               description { state: "default" 0.0; \
+                                       visible: 0; \
+                                       rel1 { relative: 0.0 0.0; to: txt;} \
+                                       rel2 { relative: 1.0 1.0; to: txt;} \
+                                       fixed: 1 1; \
+                               } \
                                description { state: "pressed" 0.0; \
                                        inherit: "default" 0.0; \
                                        visible: 1; \
                                        color_class: "keypad_btn_bg_press"; \
                                } \
-                               description { state: "hide" 0.0; \
-                                       inherit: "default" 0.0; \
-                                       visible: 0; \
-                               } \
                        ) \
                        CU_PART_IMAGE( txt"_left", \
                                mouse_events: 0; \
@@ -143,7 +151,7 @@
                signal: "mouse,down,*"; \
                source: "over_"txt; \
                script { \
-                       set_state(PART:txt, "pressed", 0.0); \
+                       set_state(PART:txt"_press", "pressed", 0.0); \
                        emit("pad_down", txt); \
                } \
        } \
@@ -158,7 +166,7 @@
                signal: "mouse,up,1"; \
                source: "over_"txt; \
                script { \
-                       set_state(PART:txt, "default", 0.0); \
+                       set_state(PART:txt"_press", "default", 0.0); \
                        emit("pad_up", txt); \
                        emit("ani", "over_"txt); \
                } \

diff --git a/edje_src/edc/call_edc/callui_view_end_call.edc b/edje_src/edc/call_edc/callui_view_end_call.edc
index 89e014e..536a144 100644 (file)
--- a/edje_src/edc/call_edc/callui_view_end_call.edc
+++ b/edje_src/edc/call_edc/callui_view_end_call.edc
@@ -77,12 +77,9 @@
 #define EC_REPLY_BTN_ICON_SIZE                         EC_REPLY_BTN_ICON_DIMENT EC_REPLY_BTN_ICON_DIMENT
 
 styles {
-       style { name: "ec_reply_btn_default";
+       style { name: "ec_reply_btn";
                base: "font=Tizen:style=Regular align=center font_size=34 color=#808080 ellipsis=1.0";
        }
-       style { name: "ec_reply_btn_pressed";
-               base: "font=Tizen:style=Regular align=center font_size=34 color=#3DB9CC ellipsis=1.0";
-       }
        style { name: "ec_contact_name";
                base: "font=Tizen:style=Regular align=left font_size=56 color=#FFFFFF ellipsis=1.0";
        }
@@ -104,17 +101,17 @@ group { \
                        description { state: "default" 0.0; } \
                        description { state: "pressed" 0.0; \
                                inherit: "default" 0.0; \
-                               color_class: "AO001"; \
+                               color_class: "ec_reply_btn_bg_norm"; \
                        } \
                ) \
                CU_PART_RECT( "click_bg", \
                        mouse_events: 1; \
                        repeat_events: 0; \
                        description { state: "default" 0.0; \
-                               color: COLOR_WHITE; \
+                               visible: 0; \
                        } \
                        description { state: "pressed" 0.0; \
-                               color: 0 0 0 76; \
+                               color_class: "ec_reply_btn_bg_pressed"; \
                        } \
                ) \
                CU_PART_SPACER( "sizer", \
@@ -141,14 +138,9 @@ group { \
                                max: EC_REPLY_BTN_ICON_SIZE; \
                                fixed: 1 1; \
                                image.normal: img_path; \
-                               color_class: "AO009"; \
+                               color_class: "ec_reply_btn_icon"; \
                                align: 0.5 0.0; \
                        } \
-                       description { \
-                               state: "pressed" 0.0; \
-                               inherit: "default" 0.0; \
-                               color_class: "AO001"; \
-                       } \
                ) \
                CU_PART_SPACER( "text.padding.top", \
                        description { state: "default" 0.0; \
@@ -166,13 +158,9 @@ group { \
                                min: 0 EC_REPLY_BTN_TXT_HEIGHT; \
                                text { \
                                        fit: 1 1; \
-                                       style:"ec_reply_btn_default"; \
+                                       style:"ec_reply_btn"; \
                                } \
                        } \
-                       description { state: "pressed" 0.0; \
-                               inherit: "default" 0.0; \
-                               text.style:"ec_reply_btn_pressed"; \
-                       } \
                ) \
        } \
        programs { \
@@ -186,19 +174,13 @@ group { \
                        signal: "mouse,down,*"; \
                        source: "*"; \
                        action: STATE_SET "pressed" 0.0; \
-                       target: "bg"; \
                        target: "click_bg"; \
-                       target: "icon"; \
-                       target: "text"; \
                } \
                program { name: "unpressed"; \
                        signal: "mouse,up,*"; \
                        source: "*"; \
                        action: STATE_SET "default" 0.0; \
-                       target: "bg"; \
                        target: "click_bg"; \
-                       target: "icon"; \
-                       target: "text"; \
                } \
                program { name: "touch_snd"; \
                        action: RUN_PLUGIN "touch_sound"; \

diff --git a/edje_src/edc/callui-color-classes.edc b/edje_src/edc/callui-color-classes.edc
index f84ef55..19c1bae 100644 (file)
--- a/edje_src/edc/callui-color-classes.edc
+++ b/edje_src/edc/callui-color-classes.edc
@@ -480,5 +480,20 @@ color_classes {
                name: "active_noti_reject_message"; //AO025
                color: 0 0 0 64;
        }
+
+       // End call reply buttons
+
+       color_class {
+               name: "ec_reply_btn_bg_norm"; //AO008
+               color: 250 250 250 255;
+       }
+       color_class {
+               name: "ec_reply_btn_bg_pressed"; //AO008P
+               color: 61 185 204 77;
+       }
+       color_class {
+               name: "ec_reply_btn_icon"; //AO009
+               color: 128 128 128 255;
+       }
 }
 

diff --git a/res/edje/call_theme.edc b/res/edje/call_theme.edc
index 042641c..3aa7df1 100644 (file)
--- a/res/edje/call_theme.edc
+++ b/res/edje/call_theme.edc
@@ -2109,7 +2109,7 @@ collections {
        ACTIVE_NOTI_BTN("callui_active_noti_reject_with_msg", "active_noti_reject_message", "active_noti_reject_message");
 
 /* Bottom bar end call button */
-       CIRCLE_BTN_WITH_ICON("callui_circle_bottom_end_call", ENDCALL_BTN_SIZE, "bottom_bar_end_call", "bottom_bar_end_call", IMG_SRC_DIR/"call_end_ic_end.png", "btn_icon_def_color");
+       CIRCLE_BTN_WITH_ICON("callui_circle_bottom_end_call", ENDCALL_BTN_SIZE, "bottom_bar_end_call", "bottom_bar_end_call", IMG_SRC_DIR/"call_btn_ic_reject.png", "btn_icon_def_color");
 
 /* Multicall list buttons */
        CIRCLE_BTN_WITH_ICON("callui_multi_list_end_call", MULTI_LIST_LIST_ICON_BG_SIZE, "multi_list_btn_end_call", "multi_list_btn_end_call", IMG_SRC_DIR/"call_btn_ic_end.png", "btn_icon_def_color");