TizenRefApp-7202 [Call UI] Refactor color classes used in application 47/88447/1
authorIgor Olshevskyi <i.olshevskyi@samsung.com>
Thu, 15 Sep 2016 10:55:40 +0000 (13:55 +0300)
committerIgor Olshevskyi <i.olshevskyi@samsung.com>
Mon, 19 Sep 2016 07:09:33 +0000 (10:09 +0300)
Change-Id: I0f2ab078b40ceccef23b7da3e765262f4908fba6

13 files changed:
edje_src/edc/call_edc/callui-keypad.edc
edje_src/edc/call_edc/callui-view-caller-info.edc
edje_src/edc/call_edc/callui-view-elements.edc
edje_src/edc/call_edc/callui-view-incoming-lock.edc
edje_src/edc/call_edc/callui-view-lock-screen.edc
edje_src/edc/call_edc/callui-view-main-layout.edc
edje_src/edc/call_edc/callui-view-multi-call-list.edc
edje_src/edc/call_edc/callui-view-quick-pannel.edc
edje_src/edc/callui-color-classes.edc
inc/callui-view-layout.h
res/edje/call.edc
res/edje/call_theme.edc
src/callui-view-multi-call-list.c

index dc3c576..5ed3c10 100644 (file)
@@ -21,7 +21,7 @@
 #define CU_KEYPAD_ANIMATION_DELAY                      0.6 0.0
 #define CU_KEYPAD_DOWN_ARW_START_ANIM_MAX_H    3
 
-#define PART_KEYPAD_CUSTOM_ONE_ICON(txt, column, row, left_icon) \
+#define PART_KEYPAD_CUSTOM_ONE_ICON(txt, column, row, num_icon) \
                        CU_PART_RECT( txt, \
                                mouse_events: 1; \
                                description { state: "default" 0.0; \
@@ -49,7 +49,7 @@
                                        rel2 { relative: 0.85 0.85; to: txt; } \
                                } \
                        ) \
-                       CU_PART_IMAGE( txt"_left", \
+                       CU_PART_IMAGE( txt"_num", \
                                mouse_events: 0; \
                                repeat_events: 1; \
                                description { state: "default" 0.0; \
                                        aspect_preference: SOURCE; \
                                        rel1 { relative: (KEYPAD_BTN_OFFSET_X/KEYPAD_EACH_BTN_W) (KEYPAD_BTN_OFFSET_Y/KEYPAD_EACH_BTN_H); to: txt;} \
                                        rel2 { relative: ((KEYPAD_BTN_OFFSET_X+KEYPAD_BTN_ICON_W)/KEYPAD_EACH_BTN_W) ((KEYPAD_BTN_OFFSET_Y+KEYPAD_BTN_NUMBER_H)/KEYPAD_EACH_BTN_H); to: txt;} \
-                                       image.normal: left_icon;\
-                                       color_class: "AO003"; \
+                                       image.normal: num_icon;\
+                                       color_class: "keypad_btn_number"; \
                                        aspect_preference: SOURCE; \
-                                       visible: 1; \
                                } \
                                description { state: "hide" 0.0; \
                                        inherit: "default" 0.0; \
@@ -78,7 +77,7 @@
                                } \
                        )
 
-#define PART_KEYPAD_CUSTOM_TWO_ICON(txt, column, row, left_icon, right_icon) \
+#define PART_KEYPAD_CUSTOM_TWO_ICON(txt, column, row, num_icon, txt_icon) \
                        CU_PART_RECT( txt, \
                                mouse_events: 1; \
                                description { state: "default" 0.0; \
                                        rel2 { relative: 0.85 0.85; to: txt; } \
                                } \
                        ) \
-                       CU_PART_IMAGE( txt"_left", \
+                       CU_PART_IMAGE( txt"_num", \
                                mouse_events: 0; \
                                repeat_events: 1; \
-                               description { \
-                                       state: "default" 0.0; \
+                               description { state: "default" 0.0; \
                                        aspect: 0.0 1.0; \
                                        aspect_preference: SOURCE; \
                                        rel1 { relative: (KEYPAD_BTN_OFFSET_X/KEYPAD_EACH_BTN_W) (KEYPAD_BTN_OFFSET_Y/KEYPAD_EACH_BTN_H); to: txt;} \
                                        rel2 { relative: ((KEYPAD_BTN_OFFSET_X+KEYPAD_BTN_ICON_W)/KEYPAD_EACH_BTN_W) ((KEYPAD_BTN_OFFSET_Y+KEYPAD_BTN_NUMBER_H)/KEYPAD_EACH_BTN_H); to: txt;} \
-                                       image.normal: left_icon;\
-                                       color_class: "AO003"; \
+                                       image.normal: num_icon;\
+                                       color_class: "keypad_btn_number"; \
                                        aspect_preference: SOURCE; \
-                                       visible: 1; \
                                } \
                                description { state: "hide" 0.0; \
                                        inherit: "default" 0.0; \
                                        visible: 0; \
                                } \
                        ) \
-                       CU_PART_IMAGE( txt"_right", \
+                       CU_PART_IMAGE( txt"_txt", \
                                mouse_events: 0; \
                                repeat_events: 1; \
                                description { state: "default" 0.0; \
                                        aspect_preference: SOURCE; \
                                        rel1 { relative: (KEYPAD_BTN_OFFSET_X/KEYPAD_EACH_BTN_W) ((KEYPAD_BTN_OFFSET_Y+KEYPAD_BTN_NUMBER_H)/KEYPAD_EACH_BTN_H); to: txt;} \
                                        rel2 { relative: ((KEYPAD_BTN_OFFSET_X+KEYPAD_BTN_ICON_W)/KEYPAD_EACH_BTN_W) ((KEYPAD_BTN_OFFSET_Y+KEYPAD_BTN_NUMBER_H+KEYPAD_BTN_LETTERS_H)/KEYPAD_EACH_BTN_H); to: txt;} \
-                                       image.normal: right_icon; \
-                                       color_class: "AO004_C"; \
+                                       image.normal: txt_icon; \
+                                       color_class: "keypad_btn_txt"; \
                                        aspect_preference: SOURCE; \
-                                       visible: 1; \
                                } \
                                description { state: "hide" 0.0; \
                                        inherit: "default" 0.0; \
index b8726db..f61a037 100644 (file)
@@ -82,7 +82,7 @@ group{
                                rel1 { relative: 0.0 0.0;       to: "bg"; }
                                rel2 { relative: 1.0 1.0;       to: "bg"; }
                                image.normal: IMG_SRC_DIR/"call_multi_ic_arrow.png";
-                               color_class: "AO026";
+                               color_class: "manage_calls_arrow";
                        }
                )
        }
index 3ef42da..80f74e8 100644 (file)
@@ -184,7 +184,7 @@ group { name: "caller_id";
                        }
                        description { state: "single" 0.0;
                                inherit: "default" 0.0;
-                               color_class: "AO003L2";
+                               color_class: "cid_default";
                        }
                        description { state: "emergency" 0.0;
                                inherit: "default" 0.0;
@@ -195,7 +195,7 @@ group { name: "caller_id";
                                inherit: "default" 0.0;
                                image.normal: "cid_conference";
                                aspect_preference: SOURCE;
-                               color_class: "AO003L2";
+                               color_class: "cid_default";
                        }
                        description { state: "message" 0.0;
                                inherit: "default" 0.0;
index 1fc3678..1e52062 100644 (file)
@@ -502,10 +502,10 @@ group { name: "lock_accept";
 
                CREATE_OUTER_CIRCLE_RECT("rect_outer_circle", MTLOCK_ACCEPT_OUTER_CIRCLE_L, MTLOCK_ACCEPT_OUTER_CIRCLE_T, MTLOCK_ACCEPT_OUTER_CIRCLE_R, MTLOCK_ACCEPT_OUTER_CIRCLE_B)
                CREATE_OUTER_CIRCLE_CLIP("rect_outer_circle_clipper", MTLOCK_ACCEPT_OUTER_CIRCLE_L, MTLOCK_ACCEPT_OUTER_CIRCLE_CLIP_RECT_T, MTLOCK_ACCEPT_OUTER_CIRCLE_R, MTLOCK_ACCEPT_OUTER_CIRCLE_CLIP_RECT_B)
-               CREATE_OUTER_CIRCLE("accept_outer_circle", "rect_outer_circle", IMG_SRC_DIR/"call_button_bg_line_accept_reject.png", "rect_outer_circle_clipper", "AO046L1")
-               CREATE_INNER_CIRCLE_SIMPLE_IMAGE("accept_inner_circle_bg", MTLOCK_ACCEPT_INNER_CIRCLE_L, MTLOCK_ACCEPT_INNER_CIRCLE_T, MTLOCK_ACCEPT_INNER_CIRCLE_R, MTLOCK_ACCEPT_INNER_CIRCLE_B, "rect_outer_circle_clipper", IMG_SRC_DIR/"call_button_bg_accept_reject.png", "AO046");
+               CREATE_OUTER_CIRCLE("accept_outer_circle", "rect_outer_circle", IMG_SRC_DIR/"call_button_bg_line_accept_reject.png", "rect_outer_circle_clipper", "ic_accept_outer_circle")
+               CREATE_INNER_CIRCLE_SIMPLE_IMAGE("accept_inner_circle_bg", MTLOCK_ACCEPT_INNER_CIRCLE_L, MTLOCK_ACCEPT_INNER_CIRCLE_T, MTLOCK_ACCEPT_INNER_CIRCLE_R, MTLOCK_ACCEPT_INNER_CIRCLE_B, "rect_outer_circle_clipper", IMG_SRC_DIR/"call_button_bg_accept_reject.png", "ic_accept_inner_circle_bg");
 
-               CREATE_INNER_CIRCLE("accept_inner_circle", MTLOCK_ACCEPT_INNER_CIRCLE_L, MTLOCK_ACCEPT_INNER_CIRCLE_T, MTLOCK_ACCEPT_INNER_CIRCLE_R, MTLOCK_ACCEPT_INNER_CIRCLE_B, IMG_SRC_DIR/"call_btn_ic_accept.png", "AO004")
+               CREATE_INNER_CIRCLE("accept_inner_circle", MTLOCK_ACCEPT_INNER_CIRCLE_L, MTLOCK_ACCEPT_INNER_CIRCLE_T, MTLOCK_ACCEPT_INNER_CIRCLE_R, MTLOCK_ACCEPT_INNER_CIRCLE_B, IMG_SRC_DIR/"call_btn_ic_accept.png", "ic_accept_inner_circle")
        }
 
        programs {
@@ -535,10 +535,10 @@ group {
                }
                CREATE_OUTER_CIRCLE_RECT("rect_outer_circle", MTLOCK_REJECT_OUTER_CIRCLE_L, MTLOCK_REJECT_OUTER_CIRCLE_T, MTLOCK_REJECT_OUTER_CIRCLE_R, MTLOCK_REJECT_OUTER_CIRCLE_B)
                CREATE_OUTER_CIRCLE_CLIP("rect_outer_circle_clipper", MTLOCK_REJECT_OUTER_CIRCLE_L, MTLOCK_REJECT_OUTER_CIRCLE_CLIP_RECT_T, MTLOCK_REJECT_OUTER_CIRCLE_R, MTLOCK_REJECT_OUTER_CIRCLE_CLIP_RECT_B)
-               CREATE_OUTER_CIRCLE("reject_outer_circle", "rect_outer_circle", IMG_SRC_DIR/"call_button_bg_line_accept_reject.png", "rect_outer_circle_clipper", "AO047L1")
-               CREATE_INNER_CIRCLE_SIMPLE_IMAGE("reject_inner_circle_bg", MTLOCK_REJECT_INNER_CIRCLE_L, MTLOCK_REJECT_INNER_CIRCLE_T, MTLOCK_REJECT_INNER_CIRCLE_R, MTLOCK_REJECT_INNER_CIRCLE_B, "rect_outer_circle_clipper", IMG_SRC_DIR/"call_button_bg_accept_reject.png", "AO047");
+               CREATE_OUTER_CIRCLE("reject_outer_circle", "rect_outer_circle", IMG_SRC_DIR/"call_button_bg_line_accept_reject.png", "rect_outer_circle_clipper", "ic_reject_outer_circle")
+               CREATE_INNER_CIRCLE_SIMPLE_IMAGE("reject_inner_circle_bg", MTLOCK_REJECT_INNER_CIRCLE_L, MTLOCK_REJECT_INNER_CIRCLE_T, MTLOCK_REJECT_INNER_CIRCLE_R, MTLOCK_REJECT_INNER_CIRCLE_B, "rect_outer_circle_clipper", IMG_SRC_DIR/"call_button_bg_accept_reject.png", "ic_reject_inner_circle_bg");
 
-               CREATE_INNER_CIRCLE("reject_inner_circle", MTLOCK_REJECT_INNER_CIRCLE_L, MTLOCK_REJECT_INNER_CIRCLE_T, MTLOCK_REJECT_INNER_CIRCLE_R, MTLOCK_REJECT_INNER_CIRCLE_B, IMG_SRC_DIR/"call_btn_ic_reject.png", "AO005")
+               CREATE_INNER_CIRCLE("reject_inner_circle", MTLOCK_REJECT_INNER_CIRCLE_L, MTLOCK_REJECT_INNER_CIRCLE_T, MTLOCK_REJECT_INNER_CIRCLE_R, MTLOCK_REJECT_INNER_CIRCLE_B, IMG_SRC_DIR/"call_btn_ic_reject.png", "ic_reject_inner_circle")
        }
 
        programs {
index 8726b4d..133f0a7 100644 (file)
@@ -18,7 +18,7 @@
 styles {
        style {
                name: "lock_screen_txt_style";
-               base: "font="VC_FONT_REGULAR" font_size=40 color=#FFFFFF color_class:"ATO011" align=center text_class="ATO011" wrap=mixed";
+               base: "font="VC_FONT_REGULAR" font_size=40 color=#fafafaff align=center wrap=mixed";
                tag: "br" "\n";
                tag: "tab" "\t";
        }
@@ -71,10 +71,8 @@ group {
                                rel2 {relative: LOCK_SCREEN_TEXT_R LOCK_SCREEN_TEXT_B; to: background; }
                                text {
                                        style: "lock_screen_txt_style";
-                                       text_class: "ATO011";
                                        align: 0 0;
                                }
-                               color_class: "ATO011";
                        }
                }
        }
index 3437799..83a94b2 100644 (file)
@@ -111,7 +111,7 @@ group { name: "app_main_ly";
 styles {
        style {
                name: "call_timer_style";
-               base: "font="VC_FONT_REGULAR" align=left font_size=40 color=#FFFFFF ellipsis=1.0";
+               base: "font="VC_FONT_REGULAR" align=left font_size=40 color=#fafafaff ellipsis=1.0";
        }
 }
 
index 025a812..dc62d3a 100644 (file)
  *
  */
 
-group {
-       name: "multicall_list";
-       parts {
-               part { name: "background";
-                       type: RECT;
-                       description {
-                               state: "default" 0.0;
-                               color_class: "AO052";
-                       }
-               }
+#define MULTICALL_LIST_BOTTOM_BTN_SIZE         496
+#define MULTICALL_LIST_TIMER_TXT_PAD_BOTTOM    20
+#define MULTICALL_LIST_CONTENT_PADDING         (CALL_STATUS_TXT_PAD_TOP + CALL_STATUS_TXT_HEIGHT + MULTICALL_LIST_TIMER_TXT_PAD_BOTTOM)
+#define MULTICALL_LIST_BOTTOM_BTN_PAD_LR       ((MAIN_SCREEN_W - MULTICALL_LIST_BOTTOM_BTN_SIZE) / 2)
 
-               part {
-                       name: "call_info_upper/rect";
-                       type: RECT;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0 INDICATOR_HEIGHT/MULTI_LIST_HEIGHT; to: "background"; }
-                               rel2 { relative: 1 (INDICATOR_HEIGHT+72)/MULTI_LIST_HEIGHT; to: "background"; }
-                               color_class: "AO052";
-                       }
-               }
-
-               part { name: "call_txt_status";
-                       type: TEXT;
+group { name: "multicall_list_view_ly";
+       parts {
+               part { name: "bg";
+                       type: IMAGE;
                        scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 32/MAIN_SCREEN_W 0; to: "call_info_upper/rect";}
-                               rel2 { relative: 1 1;  to: "call_info_upper/rect";}
-                               fixed: 1 1;
-                               text {
-                                       align: 0 0.5;
-                                       text_class: "ATO016";
-                               }
-                               color_class: "multi_list_txt_status";
+                       description { state: "default" 0.0;
+                               image.normal: IMG_SRC_DIR/"background.png";
                        }
                }
-
-               /* CALL TIME*/
-               part { name: "txt_timer";       /*Call time or Call status*/
-                       type: TEXT;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0 0; to: "call_info_upper/rect";}
-                               rel2 { relative: (MAIN_SCREEN_W-32)/MAIN_SCREEN_W 1; to: "call_info_upper/rect";}
-                               fixed: 1 1;
-                               text {
-                                       align: 1 0.5;
-                                       text_class: "ATO017";
-                               }
-                               color_class: "ATO017";
+               CU_PART_PADDING_TOP_NAME("call_time_bg", MULTICALL_LIST_CONTENT_PADDING)
+               CU_PART_PADDING_LEFT(MAIN_VIEW_LAYOUT_PAD_LEFT)
+               CU_PART_PADDING_RIGHT(MAIN_VIEW_LAYOUT_PAD_RIGHT)
+               CU_PART_PADDING_LEFT_NAME("bottom_btn.padding.left", MULTICALL_LIST_BOTTOM_BTN_PAD_LR)
+               CU_PART_PADDING_RIGHT_NAME("bottom_btn.padding.right", MULTICALL_LIST_BOTTOM_BTN_PAD_LR)
+               CU_PART_PADDING_TOP_NAME("title_txt.padding.top", CALL_STATUS_TXT_PAD_TOP)
+               CU_PART_TEXTBLOCK( "call_txt_status",
+                       description { state: "default" 0.0;
+                               min: 0 CALL_STATUS_TXT_HEIGHT;
+                               fixed: 0 1;
+                               rel1 { relative: 1.0 1.0; to_x: "padding.left"; to_y: "title_txt.padding.top"; }
+                               rel2 { relative: 0.0 1.0; to_x: "padding.right"; to_y: "title_txt.padding.top"; }
+                               text.style: "call_timer_style";
+                               align: 0.0 0.0;
                        }
-               }
-
-               part { name: "swl_calllist";
+               )
+               CU_PART_SWALLOW( "swallow.call_list",
                        type: SWALLOW;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0 (INDICATOR_HEIGHT+72)/MULTI_LIST_HEIGHT; to: "background"; }
-                               rel2 { relative: 1 (MULTI_LIST_HEIGHT-ENDCALL_BTN_BG_H)/MULTI_LIST_HEIGHT; to: "background"; }
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               rel1 { relative: 0.0 1.0; to: "call_time_bg"; }
+                               rel2 { relative: 1.0 0.0; to: "bottom_btn_bg"; }
                        }
-               }
-
-               part {
-                       name: "bottom_btn/rect";
-                       type: RECT;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: 0 (MULTI_LIST_HEIGHT-ENDCALL_BTN_BG_H)/MULTI_LIST_HEIGHT; to: "background"; }
-                               rel2 { relative: 1 1; to: "background"; }
-                               color: 255 255 255 255;
+               )
+               CU_PART_RECT( "bottom_btn_bg",
+                       mouse_events: 0;
+                       repeat_events: 1;
+                       description { state: "default" 0.0;
+                               rel1 { relative: 0.0 1.0; to: "bg"; }
+                               rel2 { relative: 1.0 1.0; to: "bg"; }
+                               min: 0 ENDCALL_BTN_BG_H;
+                               fixed: 0 1;
+                               align: 0.5 1.0;
+                               color_class: "end_call_toolbar_bg";
                        }
-               }
-
-               part {
-                       name: "bottom_btn";
-                       type: SWALLOW;
-                       description {
-                               state: "default" 0.0;
-                               rel1 { relative: BACK_BTN_L 0; to:"bottom_btn/rect"; }
-                               rel2 { relative: BACK_BTN_R 1; to:"bottom_btn/rect"; }
+               )
+               CU_PART_SWALLOW( "bottom_btn",
+                       description { state: "default" 0.0;
+                               rel1 { relative: 1.0 0.0; to_x: "bottom_btn.padding.left"; to_y: "bottom_btn_bg"; }
+                               rel2 { relative: 0.0 1.0; to_x: "bottom_btn.padding.right"; to_y: "bottom_btn_bg"; }
                        }
-               }
-       }//parts
+               )
+       }
 }
index cab9bb3..231757d 100644 (file)
 
 styles {
        style { name: "style_caller_name";
-               base: "font=Tizen:style=Regular font_size=40 color=#FFFFFF color_class="ATO005QP" align=left ellipsis=1.0 text_class=ATO005QP";
+               base: "font=Tizen:style=Regular font_size=40 color=#000000ff align=left ellipsis=0.0";
        }
        style { name: "style_call_time";
-               base: "font=Tizen:style=Regular font_size=30 color=#FFFFFF color_class="ATO006QP" align=left ellipsis=1.0 text_class=ATO006QP";
+               base: "font=Tizen:style=Regular font_size=30 color=#7f7f7fff align=left ellipsis=1.0";
        }
 }
 
@@ -244,13 +244,9 @@ group { name: "quickpanel";
                                rel2 { relative: 1.0 0.0; to: "txt_area"; }
                                min: 0 QP_CALL_NAME_TXT_H;
                                text {
-                                       ellipsis: 0.0;
                                        fit: 0 1;
-                                       align: 0.0 0.5;
                                        style: "style_caller_name";
-                                       text_class: ATO005QP;
                                }
-                               color_class: "ATO005QP";
                        }
                }
                part { name: "pad.contact_name.bottom";
@@ -274,12 +270,9 @@ group { name: "quickpanel";
                                rel2 { relative: 1.0 1.0; to: "pad.contact_name.bottom"; }
                                min: 0 QP_TIMER_TXT_H;
                                text {
-                                       align: 0.0 0.5;
-                                       ellipsis: 1.0;
                                        fit: 0 1;
                                        style: "style_call_time";
                                }
-                               color_class: "ATO006QP";
                        }
                }
                part { name: "swallow.caller_id";
index 5d22636..2194937 100644 (file)
  *
  */
 
-//Suffix "_C" - for conflict color's names
-
 color_classes {
        color_class {
-               name: "AO003";
-               color: 0 0 0 217;
-       }
-       color_class {
-               name: "AO003L2";
+               name: "cid_default"; //AO036
                color: 61 185 204 255;
        }
        color_class {
-               name: "AO004";
-               color: 83 196 12 255;
-       }
-       color_class {
-               name: "AO004_C";
-               color: 51 51 51 205;
-       }
-       color_class {
-               name: "AO004D";
-               color: 51 51 51 64;
-       }
-       color_class {
-               name: "AO004P";
-               color: 83 196 12 255;
-       }
-       color_class {
-               name: "AO008";
-               color: 249 249 249 255;
-       }
-       color_class {
-               name: "AO008P";
-               color: 61 185 204 77;
-       }
-       color_class {
-               name: "AO009";
-               color: 128 128 128 255;
-       }
-       color_class {
-               name: "multi_hold_merge_btn_norm";
-               color: 0 0 0 220;
-       }
-       color_class {
-               name: "multi_hold_merge_btn_press";
-               color: 0 0 0 255;
-       }
-       color_class {
-               name: "multi_hold_swap_btn_norm";
-               color: 0 0 0 240;
-       }
-       color_class {
-               name: "multi_hold_swap_btn_press";
-               color: 0 0 0 255;
-       }
-       color_class {
-               name: "AO011";
-               color: 50 130 136 190;
-       }
-       color_class {
-               name: "AO0111";
-               color: 51 125 133 200;
-       }
-       color_class {
-               name: "AO090";
-               color: 255 255 255 128;
-       }
-       color_class {
-               name: "AO046";
-               color: 83 196 12 59;
-       }
-       color_class {
-               name: "AO046L1";
-               color: 83 196 12 102;
-       }
-       color_class {
-               name: "AO005";
-               color: 250 57 22 255;
-       }
-       color_class {
-               name: "AO047";
-               color: 250 57 22 59;
-       }
-       color_class {
-               name: "AO047L1";
-               color: 250 57 22 102;
-       }
-       color_class {
-               name: "AO012";
-               color: 0 0 0 102;
-       }
-       color_class {
-               name: "AO014L1";
-               color: 255 255 255 235;
-       }
-       color_class {
-               name: "AO014L2";
-               color: 255 255 255 245;
-       }
-       color_class {
-               name: "AO014L3";
-               color: 255 255 255 219;
-       }
-       color_class {
-               name: "AO014L4";
-               color: 255 255 255 230;
-       }
-       color_class {
-               name: "AO014P";
-               color: 61 185 169 255;
-       }
-       color_class {
-               name: "AO014D";
-               color: 0 0 0 77;
-       }
-       color_class {
-               name: "AO016";
-               color: 49 148 163 255;
+               name: "action_area_bg"; //AO001
+               color: 247 247 247 255;
        }
        color_class {
-               name: "AO016L1";
-               color: 49 148 163 77;
+               name: "end_call_toolbar_bg"; //AO001 (Phone GUI)
+               color: 250 250 250 255;
        }
+
+       // Incoming Call
+
        color_class {
-               name: "AO100";
-               color: 49 148 163 255;
+               name: "ic_accept_inner_circle"; //AO005
+               color: 89 176 58 255;
        }
        color_class {
-               name: "AO100L1";
-               color: 49 148 163 51;
+               name: "ic_accept_inner_circle_bg"; //AO018
+               color: 89 176 58 77;
        }
        color_class {
-               name: "AO021";
-               color: 0 0 0 26;
+               name: "ic_accept_outer_circle";
+               color: 89 176 58 77;
        }
        color_class {
-               name: "AO022";
-               color: 0 0 0 77;
+               name: "ic_reject_inner_circle"; //AO006
+               color: 214 49 49 255;
        }
        color_class {
-               name: "AO022P";
-               color: 120 237 255 255;
+               name: "ic_reject_inner_circle_bg"; //AO017
+               color: 224 34 34 77;
        }
        color_class {
-               name: "AO039";
-               color: 186 208 217 77;
+               name: "ic_reject_outer_circle";
+               color: 224 34 34 77;
        }
        color_class {
-               name: "AO025";
+               name: "ic_reject_msg_txt"; //ATO004
                color: 61 185 204 255;
        }
        color_class {
-               name: "AO025P";
-               color: 34 104 114 255;
-       }
-       color_class {
-               name: "AO025D";
-               color: 102 190 204 255;
-       }
-       color_class {
-               name: "AO026";
-               color: 255 255 255 255;
-       }
-       color_class {
-               name: "AO026L1";
-               color: 255 255 255 245;
-       }
-       color_class {
-               name: "AO026L2";
-               color: 255 255 255 230;
-       }
-       color_class {
-               name: "AO026P";
-               color: 61 185 204 77;
-       }
-       color_class {
-               name: "AO030P";
-               color: 212 48 19 255;
-       }
-       color_class {
-               name: "AO030D";
-               color: 250 57 23 59;
-       }
-       color_class {
-               name: "AO049";
-               color: 49 148 163 255;
-       }
-       color_class {
-               name: "AO052";
+               name: "ic_reject_msg_arrow"; //AO007
                color: 61 185 204 255;
        }
+
+       // Multicall 1 Active/ 1 Hold
+
        color_class {
-               name: "AO151";
-               color: 255 255 255 77;
-       }
-       color_class {
-               name: "ATO001";
-               color: 255 255 255 255;
-       }
-       color_class {
-               name: "ATO002";
-               color: 255 255 255 255;
-       }
-       color_class {
-               name: "ATO005";
-               color: 127 127 127 255;
-       }
-       color_class {
-               name: "ATO006";
-               color: 49 148 163 77;
+               name: "multi_hold_merge_btn_norm";
+               color: 0 0 0 220;
        }
        color_class {
-               name: "ATO005QP";
+               name: "multi_hold_merge_btn_press";
                color: 0 0 0 255;
        }
        color_class {
-               name: "ATO006QP";
-               color: 127 127 127 255;
-       }
-       color_class {
-               name: "ATO007";
-               color: 255 255 255 255;
-       }
-       color_class {
-               name: "ATO008";
-               color: 49 148 163 255;
+               name: "multi_hold_swap_btn_norm";
+               color: 0 0 0 240;
        }
        color_class {
-               name: "ATO010";
+               name: "multi_hold_swap_btn_press";
                color: 0 0 0 255;
        }
-       color_class {
-               name: "ATO011";
-               color: 255 255 255 255;
-       }
-       color_class {
-               name: "ATO012";
-               color: 255 255 255 255;
-       }
-       color_class {
-               name: "ATO013";
-               color: 255 255 255 255;
-       }
-       color_class {
-               name: "ATO014";
-               color: 255 255 255 128;
-       }
-       color_class {
-               name: "ATO017";
-               color: 255 255 255 255;
-       }
-       color_class {
-               name: "AO018";
-               color: 160 240 0 255;
-       }
-       color_class {
-               name: "AO018P";
-               color: 160 240 0 255;
-       }
-       color_class {
-               name: "AO018D";
-               color: 160 240 0 102;
-       }
-       color_class {
-               name: "AO019";
-               color: 255 255 255 255;
-       }
-       color_class {
-               name: "AO019P";
-               color: 255 255 255 255;
-       }
-       color_class {
-               name: "action_area_bg"; //AO001
-               color: 247 247 247 255;
-       }
-       color_class {
-               name: "end_call_toolbar_bg"; //AO001_Phone
-               color: 250 250 250 255;
-       }
-       color_class {
-               name: "ic_reject_msg_txt"; //ATO004
-               color: 61 185 204 255;
-       }
-       color_class {
-               name: "ic_reject_msg_arrow"; //AO007
-               color: 61 185 204 255;
-       }
 
        // Multi list
 
        color_class {
-               name: "multi_list_txt_status";
-               color: 255 255 255 255;
-       }
-       color_class {
                name: "multi_list_btn_split_call"; //AO013
                color: 61 185 204 255;
        }
@@ -321,6 +97,10 @@ color_classes {
                name: "btn_icon_def_color"; //AO015
                color: 250 250 250 255;
        }
+       color_class {
+               name: "manage_calls_arrow"; //AO012
+               color: 250 250 250 255;
+       }
 
        // Keypad
 
@@ -329,16 +109,24 @@ color_classes {
                color: 250 250 250 26;
        }
        color_class {
-               name: "keypad_btn_divider"; //AO008_Phone
+               name: "keypad_btn_divider"; //AO008 (Phone GUI)
                color: 217 217 217 255;
        }
        color_class {
-               name: "keypad_btn_bg_norm"; //AO005_Phone
-               color: 255 255 255 255;
+               name: "keypad_btn_bg_norm"; //AO005 (Phone GUI)
+               color: 250 250 250 255;
        }
        color_class {
-               name: "keypad_btn_bg_press"; //AO015
-               color: 61 185 204 77;
+               name: "keypad_btn_bg_press"; //AO005P (Phone GUI)
+               color: 61 185 204 128;
+       }
+       color_class {
+               name: "keypad_btn_number"; //AO003 (Phone GUI)
+               color: 0 0 0 217;
+       }
+       color_class {
+               name: "keypad_btn_txt"; //AO004 (Phone GUI)
+               color: 51 51 51 204;
        }
 
        // Action Bar
index ba6f1f2..cc4eb25 100755 (executable)
 #define MANAGE_BTN_R   (1-REL_CALLER_INFO_W(MANAGE_BTN_R_OFFSET))
 #define MANAGE_BTN_B   (1-REL_CALLER_INFO_H(MANAGE_BTN_B_OFFSET))
 
-/* Back button */
-#define BACK_BTN_SIZE 496
-
-#define BACK_BTN_L             ((1-REL_W(BACK_BTN_SIZE))/2)
-#define BACK_BTN_R             (1-BACK_BTN_L)
-
 /* One hold in conference layout */
 #define ONE_HOLD_H             712
 #define ONE_HOLD_B             REL_H(ONE_HOLD_H)
index 996c39b..393592d 100644 (file)
@@ -39,10 +39,10 @@ collections {
        #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"
-       #include "../../edje_src/edc/call_edc/callui-view-multi-call-list.edc"
        #include "../../edje_src/edc/call_edc/callui-keypad.edc"
        #include "../../edje_src/edc/call_edc/callui-view-caller-info.edc"
        #include "../../edje_src/edc/call_edc/callui-view-main-layout.edc"
+       #include "../../edje_src/edc/call_edc/callui-view-multi-call-list.edc"
        #include "../../edje_src/edc/call_edc/callui-view-lock-screen.edc"
        #include "../../edje_src/edc/call_edc/callui-view-quick-pannel.edc"
        #include "../../edje_src/edc/call_edc/callui_view_incoming_active.edc"
index c4ba2db..54fed21 100644 (file)
@@ -407,7 +407,7 @@ styles {
                } \
        }
 
-#define QP_MC_TOGGLE_BTN(grp_name, bg_cc, bg_cc_p, img, img_cc, img_cc_p) \
+#define QP_MC_TOGGLE_BTN(grp_name, bg_cc, bg_cc_p, img) \
        group { name: "elm/button/base/"grp_name; \
                data { \
                        item: "focus_highlight" "on"; \
@@ -1369,20 +1369,20 @@ collections {
        ACTION_BTN("callui_action_btn_contacts", ICON_IMG_PATH"/call_btn_contacts.png")
 
 /* This style is for End button in quickpanel view */
-       QP_MC_TOGGLE_BTN(callui_qp_btn_end, "qp_mc_reject_norm", "qp_mc_reject_press", ICON_IMG_PATH"/call_noti_btn_end.png", "ATO017", "ATO017");
-       QP_MC_TOGGLE_BTN(callui_qp_btn_call, "qp_mc_accept_norm", "qp_mc_accept_press", ICON_IMG_PATH"/call_noti_btn_send.png", "ATO017", "ATO017");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_end, "qp_mc_reject_norm", "qp_mc_reject_press", ICON_IMG_PATH"/call_noti_btn_end.png");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_call, "qp_mc_accept_norm", "qp_mc_accept_press", ICON_IMG_PATH"/call_noti_btn_send.png");
 
 /* This style is for mute/unhold button in quickpanel view */
-       QP_MC_TOGGLE_BTN(callui_qp_btn_mute, "qp_mc_toogle_norm", "qp_mc_toogle_norm", ICON_IMG_PATH"/call_noti_btn_mute.png", "AO019", "AO019P");
-       QP_MC_TOGGLE_BTN(callui_qp_btn_mute_on, "qp_mc_toogle_off", "qp_mc_toogle_off", ICON_IMG_PATH"/call_noti_btn_mute.png", "AO018", "AO018P");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_mute, "qp_mc_toogle_norm", "qp_mc_toogle_norm", ICON_IMG_PATH"/call_noti_btn_mute.png");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_mute_on, "qp_mc_toogle_off", "qp_mc_toogle_off", ICON_IMG_PATH"/call_noti_btn_mute.png");
 
 /* This style is for speaker/unhold button in quickpanel view */
-       QP_MC_TOGGLE_BTN(callui_qp_btn_speaker, "qp_mc_toogle_norm", "qp_mc_toogle_norm", ICON_IMG_PATH"/call_noti_btn_speaker.png", "AO019", "AO019P");
-       QP_MC_TOGGLE_BTN(callui_qp_btn_speaker_on, "qp_mc_toogle_off", "qp_mc_toogle_off", ICON_IMG_PATH"/call_noti_btn_speaker.png", "AO018", "AO018P");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_speaker, "qp_mc_toogle_norm", "qp_mc_toogle_norm", ICON_IMG_PATH"/call_noti_btn_speaker.png");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_speaker_on, "qp_mc_toogle_off", "qp_mc_toogle_off", ICON_IMG_PATH"/call_noti_btn_speaker.png");
 
 /* This style is for speaker/resume button in quickpanel view */
-       QP_MC_TOGGLE_BTN(callui_qp_btn_resume, "qp_mc_toogle_norm", "qp_mc_toogle_norm", ICON_IMG_PATH"/call_noti_btn_resume.png", "AO019", "AO019P");
-       QP_MC_TOGGLE_BTN(callui_qp_btn_resume_on, "qp_mc_toogle_off", "qp_mc_toogle_off", ICON_IMG_PATH"/call_noti_btn_resume.png", "AO018", "AO018P");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_resume, "qp_mc_toogle_norm", "qp_mc_toogle_norm", ICON_IMG_PATH"/call_noti_btn_resume.png");
+       QP_MC_TOGGLE_BTN(callui_qp_btn_resume_on, "qp_mc_toogle_off", "qp_mc_toogle_off", ICON_IMG_PATH"/call_noti_btn_resume.png");
 
 /* Active notification buttons */
        ACTIVE_NOTI_BTN("callui_active_noti_accept", "active_noti_accept_call", "active_noti_accept_call");
index 4559762..4eea9c9 100755 (executable)
@@ -26,7 +26,7 @@
 #include "callui-view-layout.h"
 #include "callui-state-provider.h"
 
-#define CALLUI_GROUP_MULTICALL                 "multicall_list"
+#define CALLUI_GROUP_MULTICALL_LIST_VIEW_LY                    "multicall_list_view_ly"
 
 #define CALLUI_APP_DATA_NAME                   "app_data"
 
@@ -184,7 +184,7 @@ static callui_result_e __create_main_content(callui_view_mc_list_h vd, Evas_Obje
 {
        callui_app_data_t *ad = vd->base_view.ad;
 
-       vd->base_view.contents = _callui_load_edj(parent, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_MULTICALL);
+       vd->base_view.contents = _callui_load_edj(parent, CALLUI_CALL_EDJ_PATH, CALLUI_GROUP_MULTICALL_LIST_VIEW_LY);
        CALLUI_RETURN_VALUE_IF_FAIL(vd->base_view.contents, CALLUI_RESULT_ALLOCATION_FAIL);
        elm_object_part_content_set(parent, "elm.swallow.content", vd->base_view.contents);
 
@@ -318,7 +318,7 @@ static callui_result_e __caller_genlist_add(callui_view_mc_list_h vd)
        CALLUI_RETURN_VALUE_IF_FAIL(genlist, CALLUI_RESULT_ALLOCATION_FAIL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       elm_object_part_content_set(vd->base_view.contents, "swl_calllist", genlist);
+       elm_object_part_content_set(vd->base_view.contents, "swallow.call_list", genlist);
        evas_object_data_set(genlist, CALLUI_APP_DATA_NAME, vd->base_view.ad);
        vd->call_genlist = genlist;