TizenRefApp-6978 [Call UI] Remove old resources from project 23/84823/4
authorIgor Olshevskyi <i.olshevskyi@samsung.com>
Mon, 22 Aug 2016 12:33:47 +0000 (15:33 +0300)
committerIgor Olshevskyi <i.olshevskyi@samsung.com>
Mon, 22 Aug 2016 13:08:51 +0000 (16:08 +0300)
Change-Id: I73cc1d477309f89497906a25ce905a15bcd0786c

37 files changed:
CMake/CMakeLists.txt
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-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-one-hold-in-conference.edc
edje_src/edc/call_edc/callui_view_end_call.edc
edje_src/edc/call_edc/callui_view_incoming_active.edc
edje_src/images/call_edc/button_edit_bg_new.png [deleted file]
edje_src/images/call_edc/call_bg_dim.png [new file with mode: 0644]
edje_src/images/call_edc/call_button_icon_01.png [deleted file]
edje_src/images/call_edc/call_button_icon_03.png [deleted file]
edje_src/images/call_edc/call_button_icon_04.png [deleted file]
edje_src/images/call_edc/call_end_call.png [new file with mode: 0644]
edje_src/images/call_edc/call_end_ic_call.png [new file with mode: 0644]
edje_src/images/call_edc/call_end_ic_end.png [new file with mode: 0644]
edje_src/images/call_edc/call_end_message.png [new file with mode: 0644]
edje_src/images/call_edc/call_lock_icon.png
edje_src/images/call_edc/call_open_arrow_02.png [deleted file]
edje_src/images/call_edc/without_proximity_seneor_bg.png [deleted file]
edje_src/images/call_theme/icon/call_btn_end_01.png [deleted file]
edje_src/images/call_theme/icon/call_btn_end_02.png [deleted file]
edje_src/images/call_theme/icon/call_btn_end_03.png [deleted file]
edje_src/images/call_theme/icon/call_noti_btn_end.png [moved from edje_src/images/call_theme/icon/icon_end_call.png with 100% similarity]
edje_src/images/call_theme/icon/call_noti_btn_mute.png [moved from edje_src/images/call_theme/icon/icon_mic.png with 100% similarity]
edje_src/images/call_theme/icon/call_noti_btn_resume.png [moved from edje_src/images/call_theme/icon/call_btn_resume.png with 100% similarity]
edje_src/images/call_theme/icon/call_noti_btn_send.png [moved from edje_src/images/call_theme/icon/icon_call.png with 100% similarity]
edje_src/images/call_theme/icon/call_noti_btn_speaker.png [moved from edje_src/images/call_theme/icon/icon_speaker.png with 100% similarity]
edje_src/images/call_theme/icon/call_onoff_bar.#.png
res/edje/call.edc
res/edje/call_theme.edc
res/images/call_button_icon_01.png [deleted file]
res/images/call_button_icon_03.png [deleted file]
src/callui-view-elements.c
src/callui-view-incoming-call-noti.c
src/callui.c

index a67b228..1636db2 100755 (executable)
@@ -108,7 +108,3 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/call_theme.edj DESTINATION ${EDJ_DIR})
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BIN_DIR})
 INSTALL(DIRECTORY DESTINATION ${DATADIR})
 INSTALL(FILES ${PROJECT_FILES_DIR}/${PKG_NAME}.xml DESTINATION ${CMAKE_SHARE_PACKAGES_DIR})
-
-# install manifest file & icon
-INSTALL(FILES ${PROJECT_FILES_DIR}/res/images/call_button_icon_01.png DESTINATION ${IMG_DIR})
-INSTALL(FILES ${PROJECT_FILES_DIR}/res/images/call_button_icon_03.png DESTINATION ${IMG_DIR})
index 0ab90d3..887d23c 100644 (file)
@@ -270,6 +270,29 @@ group{ name: "keypad_layout";
 }
 
 group{ name: "keypad";
+       images {
+               image: IMG_SRC_DIR/"keypad_number_01.png" COMP;
+               image: IMG_SRC_DIR/"keypad_number_02.png" COMP;
+               image: IMG_SRC_DIR/"keypad_number_03.png" COMP;
+               image: IMG_SRC_DIR/"keypad_number_04.png" COMP;
+               image: IMG_SRC_DIR/"keypad_number_05.png" COMP;
+               image: IMG_SRC_DIR/"keypad_number_06.png" COMP;
+               image: IMG_SRC_DIR/"keypad_number_07.png" COMP;
+               image: IMG_SRC_DIR/"keypad_number_08.png" COMP;
+               image: IMG_SRC_DIR/"keypad_number_09.png" COMP;
+               image: IMG_SRC_DIR/"keypad_english_01.png" COMP;
+               image: IMG_SRC_DIR/"keypad_english_02.png" COMP;
+               image: IMG_SRC_DIR/"keypad_english_03.png" COMP;
+               image: IMG_SRC_DIR/"keypad_english_04.png" COMP;
+               image: IMG_SRC_DIR/"keypad_english_05.png" COMP;
+               image: IMG_SRC_DIR/"keypad_english_06.png" COMP;
+               image: IMG_SRC_DIR/"keypad_english_07.png" COMP;
+               image: IMG_SRC_DIR/"keypad_english_08.png" COMP;
+               image: IMG_SRC_DIR/"keypad_number_asterisk.png" COMP;
+               image: IMG_SRC_DIR/"keypad_number_00.png" COMP;
+               image: IMG_SRC_DIR/"keypad_number_sharp.png" COMP;
+               image: IMG_SRC_DIR/"call_open_arrow_01.png" COMP;
+       }
        parts {
                CU_PART_SPACER( "bg",
                        description { state: "default" 0.0; }
index fa88487..0cdf5c7 100644 (file)
@@ -69,6 +69,9 @@ styles {
 
 group{
        name: "manage_calls";
+       images {
+               image: IMG_SRC_DIR/"call_multi_ic_arrow.png" COMP;
+       }
        parts {
                CU_PART_SPACER( "bg",
                        description { state: "default" 0.0; }
@@ -87,6 +90,9 @@ group{
 
 group{
        name: "caller_info";
+       images {
+               image: IMG_SRC_DIR/"core_button_add.png" COMP;
+       }
        parts {
                CU_PART_SPACER( "bg",
                        description { state: "default" 0.0; }
index ca5af47..afc77b1 100644 (file)
@@ -66,7 +66,7 @@
                        rel1 { relative: 0.4 0.4; to: reference; } \
                        rel2 { relative: 0.6 0.6; to: reference; } \
                        image { \
-                               normal: IMG_SRC_DIR/icon_name; \
+                               normal: icon_name; \
                        } \
                        align: 0.0 0.5; \
                        color_class: color_code; \
                        rel1 { relative: lpos tpos; } \
                        rel2 { relative: rpos bpos; } \
                        image { \
-                               normal: IMG_SRC_DIR/icon_name; \
+                               normal: icon_name; \
                        } \
                        align: 0.0 0.5; \
                        color_class: color_code; \
                        rel1 { relative: 0.0 0.0; to: part_name; } \
                        rel2 { relative: 1.0 1.0; to: part_name; } \
                        image { \
-                               normal: IMG_SRC_DIR/icon_name; \
+                               normal: icon_name; \
                        } \
                        align: 0.5 0.5; \
                        max: MTLOCK_CALL_ICON_W MTLOCK_CALL_ICON_H; \
                after: after_prog_name; \
        }
 
-group {
-       name: "lock_accept";
-
+group { name: "lock_accept";
+       images {
+               image: IMG_SRC_DIR/"call_button_bg_line_accept_reject.png" COMP;
+               image: IMG_SRC_DIR/"call_button_bg_accept_reject.png" COMP;
+               image: IMG_SRC_DIR/"call_btn_ic_accept.png" COMP;
+               image: IMG_SRC_DIR/"call_btn_circle.png" COMP;
+       }
        parts {
                part {
                        name: "background";
@@ -498,10 +502,10 @@ group {
 
                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", "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", "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", "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_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, "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", "AO004")
        }
 
        programs {
@@ -512,7 +516,12 @@ group {
 
 group {
        name: "lock_reject";
-
+       images {
+               image: IMG_SRC_DIR/"call_button_bg_line_accept_reject.png" COMP;
+               image: IMG_SRC_DIR/"call_button_bg_accept_reject.png" COMP;
+               image: IMG_SRC_DIR/"call_btn_ic_reject.png" COMP;
+               image: IMG_SRC_DIR/"call_btn_circle.png" COMP;
+       }
        parts {
                part {
                        name: "background";
@@ -526,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", "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", "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", "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_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, "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", "AO005")
        }
 
        programs {
@@ -539,9 +548,11 @@ group {
 }
 
 
-group {
-       name: "lock_reject_with_msg";
-
+group { name: "lock_reject_with_msg";
+       images {
+               image: IMG_SRC_DIR/"call_inline_btn_open.png" COMP;
+               image: IMG_SRC_DIR/"call_inline_btn_close.png" COMP;
+       }
        parts {
                part {
                        name: "reject_msg_bg";
index dde8041..8726b4d 100644 (file)
@@ -26,6 +26,10 @@ styles {
 
 group {
        name: "lock-screen";
+       images {
+               image: IMG_SRC_DIR/"call_lock_icon.png" COMP;
+               image: IMG_SRC_DIR/"call_bg_dim.png" COMP;
+       }
        parts {
                part { name: "background";
                        type: IMAGE;
@@ -33,7 +37,7 @@ group {
                        description {
                                state: "default" 0.0;
                                image {
-                                       normal: IMG_SRC_DIR/"without_proximity_seneor_bg.png";
+                                       normal: IMG_SRC_DIR/"call_bg_dim.png";
                                }
                                aspect_preference: BOTH;
                                align: 0.0 0.0;
index 1cafca1..77ad1b7 100644 (file)
@@ -19,8 +19,7 @@
 #define VML_LAYOUT_PAD_RIGHT           32
 #define VML_CALLER_INFO_PAD_BOTTOM     (ACTION_BAR_LAYOUT_HEIGHT + ENDCALL_BTN_BG_H)
 
-group {
-    name: "app_main_ly";
+group { name: "app_main_ly";
        parts {
                CU_PART_SPACER( "bg",
                        description { state: "default" 0.0; }
@@ -120,8 +119,11 @@ styles {
        }
 }
 
-group {
-    name: "view_main_ly";
+group { name: "view_main_ly";
+       images {
+               image: IMG_SRC_DIR/"background.png" COMP;
+               image: IMG_SRC_DIR/"background_dim.png" COMP;
+       }
        parts {
                CU_PART_IMAGE( "dim_bg",
                        description { state: "default" 0.0;
index f989ce7..894cfa7 100644 (file)
@@ -409,6 +409,9 @@ group {
 }
 
 group { name: "multi_call_split";
+       images {
+               image: IMG_SRC_DIR/"background.png" COMP;
+       }
        parts {
                part {
                        name: "background";
index d856a9f..89e014e 100644 (file)
@@ -94,6 +94,9 @@ styles {
 #define EC_REPLY_BUTTON(style_name, img_path) \
 group { \
        name: style_name; \
+       images { \
+               image: img_path COMP; \
+       } \
        parts { \
                CU_PART_RECT( "bg", \
                        mouse_events: 1; \
@@ -203,5 +206,5 @@ group { \
        } \
 } \
 
-EC_REPLY_BUTTON("call_back", IMG_SRC_DIR/"call_button_icon_03.png")
-EC_REPLY_BUTTON("message_button", IMG_SRC_DIR/"call_button_icon_04.png")
+EC_REPLY_BUTTON("call_back", IMG_SRC_DIR/"call_end_call.png")
+EC_REPLY_BUTTON("message_button", IMG_SRC_DIR/"call_end_message.png")
index 79c8816..77c47c6 100644 (file)
@@ -136,6 +136,9 @@ group { name: "reject_msg_item";
 // TODO: temporary solution to overstep edje signal handling problem.
 
 group { name: "reject_msg_item_compose";
+       images {
+               image: IMG_SRC_DIR/"core_button_add.png" COMP;
+       }
        parts {
                CU_PART_BASE_WH(AN_MAX_W, ACTIVE_NOTI_RM_ITEM_HEIGHT)
                CU_SWALLOW_BG
@@ -228,6 +231,9 @@ group { name: "reject_msg_item_compose";
 
 group {
        name: "reject_msg_scroller_bg";
+       images {
+               image: IMG_SRC_DIR/"background.png" COMP;
+       }
        parts {
                CU_PART_IMAGE( "bg",
                        clip_to: "bg.clipper";
@@ -258,6 +264,11 @@ group {
 
 group {
        name: "main_active_noti_call";
+       images {
+               image: IMG_SRC_DIR/"background.png" COMP;
+               image: IMG_SRC_DIR/"call_inline_btn_open.png" COMP;
+               image: IMG_SRC_DIR/"call_active_ic_call.png" COMP;
+       }
        parts {
                CU_PART_IMAGE( "bg",
                        clip_to: "bg.clipper";
diff --git a/edje_src/images/call_edc/button_edit_bg_new.png b/edje_src/images/call_edc/button_edit_bg_new.png
deleted file mode 100644 (file)
index d60c5ae..0000000
Binary files a/edje_src/images/call_edc/button_edit_bg_new.png and /dev/null differ
diff --git a/edje_src/images/call_edc/call_bg_dim.png b/edje_src/images/call_edc/call_bg_dim.png
new file mode 100644 (file)
index 0000000..f60f7bf
Binary files /dev/null and b/edje_src/images/call_edc/call_bg_dim.png differ
diff --git a/edje_src/images/call_edc/call_button_icon_01.png b/edje_src/images/call_edc/call_button_icon_01.png
deleted file mode 100644 (file)
index a1f21a9..0000000
Binary files a/edje_src/images/call_edc/call_button_icon_01.png and /dev/null differ
diff --git a/edje_src/images/call_edc/call_button_icon_03.png b/edje_src/images/call_edc/call_button_icon_03.png
deleted file mode 100644 (file)
index 1b8c83a..0000000
Binary files a/edje_src/images/call_edc/call_button_icon_03.png and /dev/null differ
diff --git a/edje_src/images/call_edc/call_button_icon_04.png b/edje_src/images/call_edc/call_button_icon_04.png
deleted file mode 100644 (file)
index c31b8b6..0000000
Binary files a/edje_src/images/call_edc/call_button_icon_04.png and /dev/null differ
diff --git a/edje_src/images/call_edc/call_end_call.png b/edje_src/images/call_edc/call_end_call.png
new file mode 100644 (file)
index 0000000..a205834
Binary files /dev/null and b/edje_src/images/call_edc/call_end_call.png differ
diff --git a/edje_src/images/call_edc/call_end_ic_call.png b/edje_src/images/call_edc/call_end_ic_call.png
new file mode 100644 (file)
index 0000000..1d57113
Binary files /dev/null and b/edje_src/images/call_edc/call_end_ic_call.png differ
diff --git a/edje_src/images/call_edc/call_end_ic_end.png b/edje_src/images/call_edc/call_end_ic_end.png
new file mode 100644 (file)
index 0000000..223fb04
Binary files /dev/null and b/edje_src/images/call_edc/call_end_ic_end.png differ
diff --git a/edje_src/images/call_edc/call_end_message.png b/edje_src/images/call_edc/call_end_message.png
new file mode 100644 (file)
index 0000000..01fe884
Binary files /dev/null and b/edje_src/images/call_edc/call_end_message.png differ
index 8731ee1..874a68f 100644 (file)
Binary files a/edje_src/images/call_edc/call_lock_icon.png and b/edje_src/images/call_edc/call_lock_icon.png differ
diff --git a/edje_src/images/call_edc/call_open_arrow_02.png b/edje_src/images/call_edc/call_open_arrow_02.png
deleted file mode 100644 (file)
index 2a1a440..0000000
Binary files a/edje_src/images/call_edc/call_open_arrow_02.png and /dev/null differ
diff --git a/edje_src/images/call_edc/without_proximity_seneor_bg.png b/edje_src/images/call_edc/without_proximity_seneor_bg.png
deleted file mode 100644 (file)
index 74205a0..0000000
Binary files a/edje_src/images/call_edc/without_proximity_seneor_bg.png and /dev/null differ
diff --git a/edje_src/images/call_theme/icon/call_btn_end_01.png b/edje_src/images/call_theme/icon/call_btn_end_01.png
deleted file mode 100644 (file)
index 4c6a356..0000000
Binary files a/edje_src/images/call_theme/icon/call_btn_end_01.png and /dev/null differ
diff --git a/edje_src/images/call_theme/icon/call_btn_end_02.png b/edje_src/images/call_theme/icon/call_btn_end_02.png
deleted file mode 100644 (file)
index ad30f30..0000000
Binary files a/edje_src/images/call_theme/icon/call_btn_end_02.png and /dev/null differ
diff --git a/edje_src/images/call_theme/icon/call_btn_end_03.png b/edje_src/images/call_theme/icon/call_btn_end_03.png
deleted file mode 100644 (file)
index 2b80f2d..0000000
Binary files a/edje_src/images/call_theme/icon/call_btn_end_03.png and /dev/null differ
index 6daf3cb..1decff2 100644 (file)
Binary files a/edje_src/images/call_theme/icon/call_onoff_bar.#.png and b/edje_src/images/call_theme/icon/call_onoff_bar.#.png differ
index 179d161..b61e48a 100644 (file)
 #define        IMG_SRC_DIR                     "call_edc"
 #define        CALLID_IMG_SRC_DIR      IMG_SRC_DIR/"Caller_ID"
 
-images {
-       image: IMG_SRC_DIR/"call_inline_btn_open.png" COMP;
-       image: IMG_SRC_DIR/"call_inline_btn_close.png" COMP;
-
-       image: IMG_SRC_DIR/"call_button_div_01.png" COMP;
-       image: IMG_SRC_DIR/"call_btn_circle.png" COMP;
-       image: IMG_SRC_DIR/"call_button_bg_accept_reject.png" COMP;
-       image: IMG_SRC_DIR/"call_btn_ic_accept.png" COMP;
-       image: IMG_SRC_DIR/"call_btn_ic_reject.png" COMP;
-       image: IMG_SRC_DIR/"keypad_number_00.png" COMP;
-       image: IMG_SRC_DIR/"keypad_number_01.png" COMP;
-       image: IMG_SRC_DIR/"keypad_number_02.png" COMP;
-       image: IMG_SRC_DIR/"keypad_number_03.png" COMP;
-       image: IMG_SRC_DIR/"keypad_number_04.png" COMP;
-       image: IMG_SRC_DIR/"keypad_number_05.png" COMP;
-       image: IMG_SRC_DIR/"keypad_number_06.png" COMP;
-       image: IMG_SRC_DIR/"keypad_number_07.png" COMP;
-       image: IMG_SRC_DIR/"keypad_number_08.png" COMP;
-       image: IMG_SRC_DIR/"keypad_number_09.png" COMP;
-       image: IMG_SRC_DIR/"keypad_number_asterisk.png" COMP;
-       image: IMG_SRC_DIR/"keypad_number_sharp.png" COMP;
-       image: IMG_SRC_DIR/"keypad_english_01.png" COMP;
-       image: IMG_SRC_DIR/"keypad_english_02.png" COMP;
-       image: IMG_SRC_DIR/"keypad_english_03.png" COMP;
-       image: IMG_SRC_DIR/"keypad_english_04.png" COMP;
-       image: IMG_SRC_DIR/"keypad_english_05.png" COMP;
-       image: IMG_SRC_DIR/"keypad_english_06.png" COMP;
-       image: IMG_SRC_DIR/"keypad_english_07.png" COMP;
-       image: IMG_SRC_DIR/"keypad_english_08.png" COMP;
-       image: IMG_SRC_DIR/"call_lock_icon.png" COMP;
-
-       image: IMG_SRC_DIR/"call_multi_ic_merge.png" COMP;
-       image: IMG_SRC_DIR/"call_multi_ic_swap.png" COMP;
-       image: IMG_SRC_DIR/"call_multi_ic_arrow.png" COMP;
-       image: IMG_SRC_DIR/"call_open_arrow_01.png" COMP;
-       image: IMG_SRC_DIR/"call_open_arrow_02.png" COMP;
-       image: IMG_SRC_DIR/"call_button_bg_line_accept_reject.png" COMP;
-       image: IMG_SRC_DIR/"without_proximity_seneor_bg.png" COMP;
-       image: IMG_SRC_DIR/"button_edit_bg_new.png" COMP;
-       image: IMG_SRC_DIR/"background.png" COMP;
-       image: IMG_SRC_DIR/"background_dim.png" COMP;
-       image: IMG_SRC_DIR/"call_active_ic_call.png" COMP;
-       image: IMG_SRC_DIR/"core_button_add.png" COMP;
-}
-
 collections {
+
        plugins {
                plugin { name: "touch_sound";
                        source: "feedback";
@@ -79,10 +35,9 @@ collections {
 
        base_scale: 2.6;
 
-       RESOURCE_IMAGE("call_button_icon_01.png", IMG_SRC_DIR/"call_button_icon_01.png");
-       RESOURCE_IMAGE("call_button_icon_03.png", IMG_SRC_DIR/"call_button_icon_03.png");
-       RESOURCE_IMAGE("call_button_icon_04.png", IMG_SRC_DIR/"call_button_icon_04.png");
-       RESOURCE_IMAGE("call_inline_btn_close.png", IMG_SRC_DIR/"call_inline_btn_close.png");
+       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");
+       RESOURCE_IMAGE("call_btn_ic_reject", IMG_SRC_DIR/"call_btn_ic_reject.png");
 
        #include "../../edje_src/edc/call_edc/callui_view_end_call.edc"
        #include "../../edje_src/edc/call_edc/callui-view-button-layout.edc"
index 52bc1c5..28298be 100644 (file)
 #define AO025P 0 0 0 77
 
 #define STYLE_TAGS \
-   tag:  "br" "\n";\
-   tag:  "ps" "ps";\
-   tag:  "tab" "\t";\
-   tag:  "b" "+ font_weight=Bold";
+       tag: "br" "\n";\
+       tag: "ps" "ps";\
+       tag: "tab" "\t";\
+       tag: "b" "+ font_weight=Bold";
 
 styles {
        style { name: "ATO013";
                base: "align=center valign=center color=#ffffffff font=Tizen:style=Regular font_size=40 text_class=tizen ellipsis=1.0";
-               tag:  "br" "\n";
-               tag:  "ps" "ps";
-               tag:  "tab" "\t";
-               tag:  "b" "+ font_weight=Bold";
+               STYLE_TAGS
        }
 }
 
@@ -843,8 +840,8 @@ styles {
                                script { \
                                        if (get_int(button_state) != 1) \
                                                set_state(PART:"highlight", "default", 0.0); \
-                                               set_state(PART:"elm.text", "default", 0.0); \
-                                       } \
+                                       set_state(PART:"elm.text", "default", 0.0); \
+                               } \
                                after: button_unpress; \
                        } \
                        program { name: "touch_snd"; \
@@ -1044,8 +1041,8 @@ styles {
                                script { \
                                        if (get_int(button_state) != 1) \
                                                set_state(PART:"button_image", "default", 0.0); \
-                                               set_state(PART:"elm.text", "default", 0.0); \
-                                       } \
+                                       set_state(PART:"elm.text", "default", 0.0); \
+                               } \
                                after: button_unpress; \
                        } \
                        program { name: "touch_snd"; \
@@ -1148,8 +1145,8 @@ styles {
                                type: IMAGE; \
                                scale: 1; \
                                description { state: "default" 0.0; \
-                                       rel1 { relative: BUTTON_BOTTOM_ICON_OFFSET_L CALL_QUICKPANEL_BTN_ICON_T; to: "button_image";}  \
-                                       rel2 { relative: BUTTON_BOTTOM_ICON_OFFSET_R CALL_QUICKPANEL_BTN_ICON_B; to: "button_image";}  \
+                                       rel1 { relative: BUTTON_BOTTOM_ICON_OFFSET_L CALL_QUICKPANEL_BTN_ICON_T; to: "button_image";} \
+                                       rel2 { relative: BUTTON_BOTTOM_ICON_OFFSET_R CALL_QUICKPANEL_BTN_ICON_B; to: "button_image";} \
                                        image.normal: img; \
                                        color_class: img_cc; \
                                        align: 0.5 0.5; \
@@ -1261,6 +1258,518 @@ styles {
                } \
        }
 
+#define DEFAULT_CUSTOM_BG_BTN(grp_name, bg_color_normal, bg_color_dim) \
+       group { name: "elm/button/base/"grp_name; \
+               data.item: "vector_ux" "default"; \
+               data.item: "corner_radius" BUTTON_CORNER_RADIUS_INC; \
+               script { \
+                       public mouse_down = 0; \
+                       public multi_down = 0; \
+                       public disabled = 0; \
+                       public text = 0; \
+                       public content = 0; \
+                       public animate = 0; \
+                       public selected = 0; \
+                       public minw = 0; \
+                       public minh = 0; \
+                       public get_effect_min_size(base_effect, Float:ratio, min_w, min_h) { \
+                               new x, y, w, h; \
+                               get_geometry(base_effect, x, y, w, h); \
+                               if (w > h) { \
+                                       set_float(min_w, (w - h * (1 - ratio)) / w); \
+                                       set_float(min_h, ratio); \
+                               } else { \
+                                       set_float(min_w, ratio); \
+                                       set_float(min_h, (h - w * (1 - ratio)) / h); \
+                               } \
+                       } \
+               } \
+               parts { \
+                       part { name: "base"; \
+                               scale: 1; \
+                               type: SPACER; \
+                               description { state: "default" 0.0; \
+                                       min: BUTTON_MIN_WIDTH_INC BUTTON_MIN_HEIGHT_INC; \
+                               } \
+                       } \
+                       part { name: "tizen_vg_shape"; \
+                               type: SWALLOW; \
+                               clip_to: "tizen_vg_shape_clipper"; \
+                               scale: 1; \
+                               description { state: "default" 0.0; \
+                                       min: 0 BUTTON_MIN_HEIGHT_INC; \
+                                       rel1.relative: 0 0.0; \
+                                       rel2.relative: 1 1.0; \
+                               } \
+                       } \
+                       part { name: "tizen_vg_shape_clipper"; \
+                               type: RECT; \
+                               scale: 1; \
+                               description { state: "default" 0.0; \
+                                       color: bg_color_normal; \
+                               } \
+                               description { state: "disabled" 0.0; \
+                                       color: bg_color_dim; \
+                               } \
+                       } \
+                       part { name: "effect_spacer"; \
+                               type: SPACER; \
+                               scale: 1; \
+                               description { state: "default" 0.0; \
+                                       rel1.to: "tizen_vg_shape"; \
+                                       rel2.to: "tizen_vg_shape"; \
+                               } \
+                       } \
+                       part { name: "tizen_vg_shape2"; \
+                               type: SWALLOW; \
+                               clip_to: "tizen_vg_shape_clipper2"; \
+                               scale: 1; \
+                               description { state: "default" 0.0; \
+                                       fixed: 1 1; \
+                                       rel1.relative: 0.5 0.5; \
+                                       rel2.relative: 0.5 0.5; \
+                               } \
+                               description { state: "ready" 0.0; \
+                                       rel1.to: "effect_spacer"; \
+                                       rel2.to: "effect_spacer"; \
+                               } \
+                               description { state: "pressed" 0.0; \
+                                       inherit: "ready" 0.0; \
+                               } \
+                       } \
+                       part { name: "tizen_vg_shape_clipper2"; \
+                               type: RECT; \
+                               description { state: "default" 0.0; \
+                                       visible: 0; \
+                                       color: 0 0 0 0; \
+                               } \
+                               description { state: "ready" 0.0; \
+                                       inherit: "default" 0.0; \
+                                       visible: 1; \
+                               } \
+                               description { state: "pressed" 0.0; \
+                                       color: AO025P; \
+                               } \
+                       } \
+                       part { name: "padding_left_top"; \
+                               type: SPACER; \
+                               scale: 1; \
+                               description { state: "default" 0.0; \
+                                       align: 0.0 0.0; \
+                                       rel2.relative: 0.0 0.0; \
+                                       min: BUTTON_PADDING_LEFT_RIGHT_INC BUTTON_PADDING_TOP_HEIGHT_INC; \
+                                       fixed: 1 1; \
+                               } \
+                       } \
+                       part { name: "padding_right_bottom"; \
+                               type: SPACER; \
+                               scale: 1; \
+                               description { state: "default" 0.0; \
+                                       rel1.to: "tizen_vg_shape"; \
+                                       rel2.to: "tizen_vg_shape"; \
+                                       align: 1.0 1.0; \
+                                       rel1.relative: 1.0 1.0; \
+                                       min: BUTTON_PADDING_LEFT_RIGHT_INC BUTTON_PADDING_BOTTOM_HEIGHT_INC; \
+                                       fixed: 1 1; \
+                               } \
+                       } \
+                       part { name: "icon_rect"; \
+                               type: SPACER; \
+                               scale: 1; \
+                               description { state: "default" 0.0; \
+                                       align: 0.0 0.5; \
+                                       rel1 { \
+                                               relative: 1.0 1.0; \
+                                               to: "padding_left_top"; \
+                                       } \
+                                       rel2 { \
+                                               relative: 1.0 0.0; \
+                                               to_x: "padding_left_top"; \
+                                               to_y: "padding_right_bottom"; \
+                                       } \
+                                       min: 0 BUTTON_ICON_DEFAULT_HEIGHT_INC; \
+                                       fixed: 1 1; \
+                               } \
+                               description { state: "visible" 0.0; \
+                                       inherit: "default" 0.0; \
+                                       min: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC; \
+                                       max: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC; \
+                                       fixed: 1 1; \
+                               } \
+                               description { state: "icon_only" 0.0; \
+                                       inherit: "default" 0.0; \
+                               } \
+                       } \
+                       part { name: "icon_text_padding"; \
+                               type: SPACER; \
+                               scale: 1; \
+                               description { state: "default" 0.0; \
+                                       align: 1.0 0.5; \
+                                       min: 0 0; \
+                                       rel1 { \
+                                               relative: 0.0 0.0; \
+                                               to: "elm.text"; \
+                                       } \
+                                       rel2 { \
+                                               relative: 0.0 1.0; \
+                                               to: "elm.text"; \
+                                       } \
+                                       fixed: 1 1; \
+                               } \
+                               description { state: "visible" 0.0; \
+                                       inherit: "default" 0.0; \
+                                       min: BUTTON_PADDING_ICON_RIGHT_INC 0; \
+                               } \
+                       } \
+                       part { name: "elm.swallow.content"; \
+                               type: SWALLOW; \
+                               scale: 1; \
+                               clip_to: "clipper"; \
+                               description { state: "default" 0.0; \
+                                       align: 0.0 1.0; \
+                                       rel1 { \
+                                               relative: 1.0 1.0; \
+                                               to: "padding_left_top"; \
+                                       } \
+                                       rel2 { \
+                                               relative: 1.0 1.0; \
+                                               to_x: "padding_left_top"; \
+                                               to_y: "padding_right_bottom"; \
+                                       } \
+                                       min: 0 BUTTON_ICON_DEFAULT_HEIGHT_INC; \
+                                       fixed: 1 0; \
+                               } \
+                               description { state: "visible" 0.0; \
+                                       inherit: "default" 0.0; \
+                                       align: 1.0 0.5; \
+                                       rel1 { \
+                                               relative: 0.0 1.0; \
+                                               to_x: "icon_text_padding"; \
+                                               to_y: "padding_left_top"; \
+                                       } \
+                                       rel2 { \
+                                               relative: 0.0 0.0; \
+                                               to_x: "icon_text_padding"; \
+                                               to_y: "padding_right_bottom"; \
+                                       } \
+                                       min: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC; \
+                                       fixed: 1 1; \
+                               } \
+                               description { state: "icon_only" 0.0; \
+                                       rel1.to: "tizen_vg_shape"; \
+                                       rel2.to: "tizen_vg_shape"; \
+                                       min: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC; \
+                                       max: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC; \
+                                       align: 0.5 0.5; \
+                                       fixed: 1 1; \
+                               } \
+                       } \
+                       part { name: "elm.text"; \
+                               type: TEXTBLOCK; \
+                               mouse_events: 0; \
+                               scale: 1; \
+                               description { state: "default" 0.0; \
+                                       fixed: 1 1; \
+                                       rel1 { \
+                                               relative: 1.0 1.0; \
+                                               to_x: "icon_rect"; \
+                                               to_y: "padding_left_top"; \
+                                       } \
+                                       rel2 { \
+                                               relative: 0.0 0.0; \
+                                               to: "padding_right_bottom"; \
+                                       } \
+                                       text { \
+                                               style: "ATO013"; \
+                                               max: 1 0; \
+                                       } \
+                                       color: 250 250 250 255; \
+                               } \
+                               description { state: "pressed" 0.0; \
+                                       inherit: "default" 0.0; \
+                                       text.style: "ATO013"; \
+                                       color: 250 250 250 255; \
+                               } \
+                               description { state: "disabled" 0.0; \
+                                       inherit: "default" 0.0; \
+                                       text.style: "ATO013"; \
+                                       color: 250 250 250 163; \
+                               } \
+                       } \
+                       part { name: "clipper"; \
+                               type: RECT; \
+                               description { state: "default" 0.0; \
+                               } \
+                               description { state: "pressed" 0.0; \
+                               } \
+                               description { state: "disabled" 0.0; \
+                                       inherit: "default" 0.0; \
+                                       color: 255 255 255 163; \
+                               } \
+                       } \
+                       part { name: "event"; \
+                               type: RECT; \
+                               description { state: "default" 0.0; \
+                                       rel1.to: "tizen_vg_shape"; \
+                                       rel2.to: "tizen_vg_shape"; \
+                                       color: 0 0 0 0; \
+                               } \
+                       } \
+               } \
+               programs { \
+                       program { name: "pressed_effect"; \
+                               action: STATE_SET "ready" 0.0; \
+                               target: "tizen_vg_shape_clipper2"; \
+                               action: STATE_SET "custom" 0.0; \
+                               target: "tizen_vg_shape2"; \
+                               after: "pressed_effect2"; \
+                       } \
+                       program { name: "pressed_effect2"; \
+                               action: STATE_SET "pressed" 0.0; \
+                               target: "elm.text"; \
+                               target: "clipper"; \
+                               target: "tizen_vg_shape2"; \
+                               target: "tizen_vg_shape_clipper2"; \
+                               transition: GLIDE_EASE_OUT(0.15); \
+                               after: "pressed_effect3"; \
+                       } \
+                       program { name: "pressed_effect3"; \
+                               script { \
+                                       set_int(animate, 0); \
+                               } \
+                       } \
+                       program { name: "delay_unpressed_effect"; \
+                               in: 0.1 0.0; \
+                               after: "unpressed_effect"; \
+                       } \
+                       program { name: "unpressed_effect"; \
+                               script { \
+                                       if (get_int(disabled) == 0) { \
+                                               run_program(PROGRAM:"unpressed_effect2"); \
+                                               run_program(PROGRAM:"unpressed_effect3"); \
+                                       } else { \
+                                               run_program(PROGRAM:"disabled_effect"); \
+                                               run_program(PROGRAM:"disabled_effect2"); \
+                                               run_program(PROGRAM:"disabled_effect3"); \
+                                       } \
+                               } \
+                       } \
+                       program { name: "unpressed_effect2"; \
+                               action: STATE_SET "ready" 0.0; \
+                               target: "tizen_vg_shape2"; \
+                               target: "tizen_vg_shape_clipper2"; \
+                               transition: GLIDE_EASE_OUT(0.45); \
+                       } \
+                       program { name: "unpressed_effect3"; \
+                               action: STATE_SET "default" 0.0; \
+                               target: "elm.text"; \
+                               transition: GLIDE_EASE_OUT(0.45); \
+                               after: "unpressed_effect4"; \
+                       } \
+                       program { name: "unpressed_effect4"; \
+                               action: STATE_SET "default" 0.0; \
+                               target: "clipper"; \
+                               after: "finished_animation"; \
+                       } \
+                       program { name: "disabled_effect"; \
+                               action: STATE_SET "ready" 0.0; \
+                               target: "tizen_vg_shape2"; \
+                               target: "tizen_vg_shape_clipper2"; \
+                               transition: GLIDE_EASE_OUT(0.45); \
+                       } \
+                       program { name: "disabled_effect2"; \
+                               action: STATE_SET "disabled" 0.0; \
+                               target: "elm.text"; \
+                               transition: GLIDE_EASE_OUT(0.45); \
+                       } \
+                       program { name: "disabled_effect3"; \
+                               action: STATE_SET "disabled" 0.0; \
+                               target: "clipper"; \
+                               target: "tizen_vg_shape_clipper"; \
+                               transition: GLIDE_EASE_OUT(0.45); \
+                               after: "finished_animation"; \
+                       } \
+                       program { name: "finished_animation"; \
+                               action: STATE_SET "default" 0.0; \
+                               target: "tizen_vg_shape2"; \
+                               target: "tizen_vg_shape_clipper2"; \
+                       } \
+                       program { name: "pressed"; \
+                               signal: "mouse,down,1*"; \
+                               source: "event"; \
+                               script { \
+                                       if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0) && (get_int(disabled) == 0)) { \
+                                               new Float:rel_w, Float:rel_h; \
+                                               stop_program(PROGRAM:"delay_unpressed_effect"); \
+                                               set_int(mouse_down, 1); \
+                                               set_int(animate, 1); \
+                                               custom_state(PART:"tizen_vg_shape2", "default", 0.0); \
+                                               get_effect_min_size(PART:"effect_spacer", 0.7, minw, minh); \
+                                               rel_w = (1 - get_float(minw)) / 2; \
+                                               rel_h = (1 - get_float(minh)) / 2; \
+                                               set_state_val(PART:"tizen_vg_shape2", STATE_REL1, rel_w, rel_h); \
+                                               set_state_val(PART:"tizen_vg_shape2", STATE_REL2, 1 - rel_w, 1 - rel_h); \
+                                               emit("elm,action,press", ""); \
+                                               run_program(PROGRAM:"pressed_effect"); \
+                                       } \
+                               } \
+                       } \
+                       program { name: "unpressed"; \
+                               signal: "mouse,up,1"; \
+                               source: "event"; \
+                               script { \
+                                       if (get_int(mouse_down) == 1) { \
+                                               set_int(mouse_down, 0); \
+                                               if (get_int(disabled) == 0) { \
+                                                       if (get_int(animate) == 0) { \
+                                                               run_program(PROGRAM:"unpressed_effect"); \
+                                                       } else { \
+                                                               set_state(PART:"elm.text", "pressed", 0.0); \
+                                                               set_state(PART:"clipper", "pressed", 0.0); \
+                                                               set_state(PART:"tizen_vg_shape2", "pressed", 0.0); \
+                                                               set_state(PART:"tizen_vg_shape_clipper2", "pressed", 0.0); \
+                                                               set_int(animate, 0); \
+                                                               run_program(PROGRAM:"delay_unpressed_effect"); \
+                                                       } \
+                                                       emit("elm,action,unpress", ""); \
+                                               } \
+                                       } \
+                               } \
+                       } \
+                       program { name: "touch_snd"; \
+                               signal: "mouse,clicked,1"; \
+                               source: "event"; \
+                               script { \
+                                       if (get_int(multi_down) == 0) { \
+                                               if (get_int(disabled) == 0) { \
+                                                       run_program(PROGRAM:"touch_sound"); \
+                                                       run_program(PROGRAM:"clicked_signal"); \
+                                               } \
+                                       } \
+                               } \
+                       } \
+                       program { name: "touch_sound"; \
+                               action: RUN_PLUGIN "touch_sound"; \
+                       } \
+                       program { name: "clicked_signal"; \
+                               in: 0.001 0.0; \
+                               action: SIGNAL_EMIT "elm,action,click" ""; \
+                       } \
+                       program { name: "icon_show"; \
+                               signal: "elm,state,icon,visible"; \
+                               source: "elm"; \
+                               script { \
+                                       set_int(content, 1); \
+                                       set_state(PART:"icon_text_padding", "visible", 0.0); \
+                                       if (get_int(text) == 1) { \
+                                               set_state(PART:"icon_rect", "visible", 0.0); \
+                                               set_state(PART:"elm.swallow.content", "visible", 0.0); \
+                                       } else { \
+                                               set_state(PART:"icon_rect", "icon_only", 0.0); \
+                                               set_state(PART:"elm.swallow.content", "icon_only", 0.0); \
+                                               set_state(PART:"padding_left_top", "icon_only", 0.0); \
+                                       } \
+                               } \
+                       } \
+                       program { name: "icon_hide"; \
+                               signal: "elm,state,icon,hidden"; \
+                               source: "elm"; \
+                               script { \
+                                       set_int(content, 0); \
+                                       set_state(PART:"icon_text_padding", "default", 0.0); \
+                                       set_state(PART:"icon_rect", "default", 0.0); \
+                                       set_state(PART:"elm.swallow.content", "default", 0.0); \
+                               } \
+                       } \
+                       program { name: "text_show"; \
+                               signal: "elm,state,text,visible"; \
+                               source: "elm"; \
+                               script { \
+                                       set_int(text, 1); \
+                                       if (get_int(content) == 1) { \
+                                               set_state(PART:"icon_rect", "visible", 0.0); \
+                                               set_state(PART:"elm.swallow.content", "visible", 0.0); \
+                                       } \
+                               } \
+                       } \
+                       program { name: "text_hide"; \
+                               signal: "elm,state,text,hidden"; \
+                               source: "elm"; \
+                               script { \
+                                       set_int(text, 0); \
+                                       if (get_int(content) == 1) { \
+                                               set_state(PART:"icon_rect", "icon_only", 0.0); \
+                                               set_state(PART:"elm.swallow.content", "icon_only", 0.0); \
+                                       } \
+                               } \
+                       } \
+                       program { name: "disable"; \
+                               signal: "elm,state,disabled"; \
+                               source: "elm"; \
+                               script { \
+                                       set_int(disabled, 1); \
+                                       if (get_int(animate) == 1) return; \
+                                       set_state(PART:"clipper", "disabled", 0.0); \
+                                       set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0); \
+                                       set_state(PART:"elm.text", "disabled", 0.0); \
+                               } \
+                       } \
+                       program { name: "enable"; \
+                               signal: "elm,state,enabled"; \
+                               source: "elm"; \
+                               script { \
+                                       set_int(disabled, 0); \
+                                       set_state(PART:"clipper", "default", 0.0); \
+                                       set_state(PART:"tizen_vg_shape_clipper", "default", 0.0); \
+                                       set_state(PART:"elm.text", "default", 0.0); \
+                               } \
+                       } \
+                       program { name: "multi_down"; \
+                               signal: "elm,action,multi,down"; \
+                               source: "elm"; \
+                               script { \
+                               set_int(multi_down, 1); \
+                               } \
+                       } \
+                       program { name: "multi_up"; \
+                               signal: "elm,action,multi,up"; \
+                               source: "elm"; \
+                               script { \
+                                       set_int(multi_down, 0); \
+                               } \
+                       } \
+                       program { name: "pass_event_enable"; \
+                               signal: "elm,event,pass,enabled"; \
+                               source: "elm"; \
+                               script { \
+                                       set_mouse_events(PART:"event", 0); \
+                               } \
+                       } \
+                       program { name: "pass_event_disable"; \
+                               signal: "elm,event,pass,disabled"; \
+                               source:"elm"; \
+                               script { \
+                                       set_mouse_events(PART:"event", 1); \
+                               } \
+                       } \
+                       program { name: "repeat_event_enable"; \
+                               signal: "elm,event,repeat,enabled"; \
+                               source: "elm"; \
+                               script { \
+                                       set_repeat_events(PART:"event", 1); \
+                               } \
+                       } \
+                       program { name: "repeat_event_disable"; \
+                               signal: "elm,event,repeat,disabled"; \
+                               source:"elm"; \
+                               script { \
+                                       set_repeat_events(PART:"event", 0); \
+                               } \
+                       } \
+               } \
+       }
+
+
 collections {
 
        base_scale: 2.6;
@@ -1276,79 +1785,52 @@ collections {
        styles {
                style { name: "normal_hold";
                        base: "font=Tizen:style=Regular font_size=36 align=center color=#FAFAFAFF style=shadow,bottom shadow_color=#000000FF ellipsis=1.0 wrap=none text_class=tizen";
-                       tag: "br" "\n";
-                       tag: "ps" "ps";
-                       tag: "tab" "\t";
+                       STYLE_TAGS
                }
                style { name: "disabled_hold";
                        base: "font=Tizen:style=Regular font_size=36 align=center color=#FAFAFA80 style=shadow,bottom shadow_color=#000000FF ellipsis=1.0 wrap=none text_class=tizen";
-                       tag: "br" "\n";
-                       tag: "ps" "ps";
-                       tag: "tab" "\t";
+                       STYLE_TAGS
                }
                style { name: "normal_unhold";
                        base: "font=Tizen:style=Regular font_size=36 align=center color=#87E22DFF style=shadow,bottom shadow_color=#000000FF ellipsis=1.0 wrap=none text_class=tizen";
-                       tag: "br" "\n";
-                       tag: "ps" "ps";
-                       tag: "tab" "\t";
+                       STYLE_TAGS
                }
                style { name: "disabled_unhold";
                        base: "font=Tizen:style=Regular font_size=36 align=center color=#87E22D80 style=shadow,bottom shadow_color=#000000FF ellipsis=1.0 wrap=none text_class=tizen";
-                       tag: "br" "\n";
-                       tag: "ps" "ps";
-                       tag: "tab" "\t";
+                       STYLE_TAGS
                }
                style { name: "normal_swap";
                        base: "font=Tizen:style=Regular font_size=36 align=center color=#FAFAFAFF style=shadow,bottom shadow_color=#000000FF ellipsis=1.0 wrap=none text_class=tizen";
-                       tag: "br" "\n";
-                       tag: "ps" "ps";
-                       tag: "tab" "\t";
+                       STYLE_TAGS
                }
                style { name: "disabled_swap";
                        base: "font=Tizen:style=Regular font_size=36 align=center color=#00000080 style=shadow,bottom shadow_color=#00000066 ellipsis=1.0 wrap=none text_class=tizen";
-                       tag: "br" "\n";
-                       tag: "ps" "ps";
-                       tag: "tab" "\t";
+                       STYLE_TAGS
                }
                style { name: "end_button";
                        base: "font=Tizen:style=Regular color=#FAFAFAFF text_class="ATO008"";
-                       tag: "br" "\n";
-                       tag: "ps" "ps";
-                       tag: "tab" "\t";
+                       STYLE_TAGS
                }
                style { name: "end_button_disabled";
                        base: "font=Tizen:style=Regular color=#FAFAFAFF text_class="ATO008"";
-                       tag: "br" "\n";
-                       tag: "ps" "ps";
-                       tag: "tab" "\t";
+                       STYLE_TAGS
                }
                style { name: "end_button_disabled_visible";
                        base: "font=Tizen:style=Regular color=#FAFAFAFF text_class="ATO008"";
-                       tag: "br" "\n";
-                       tag: "ps" "ps";
-                       tag: "tab" "\t";
+                       STYLE_TAGS
+               }
+               style { name: "button_bottom";
+                       base: "font=Tizen:style=Regular font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class="ATO012" text_class="ATO012" ellipsis=1.0";
+                       STYLE_TAGS
+               }
+               style { name: "button_bottom_dim";
+                       base: "font=Tizen:style=Regular font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class="ATO014" text_class="ATO014" ellipsis=1.0";
+                       STYLE_TAGS
+               }
+               style { name: "button_bottom_press";
+                       base: "font=Tizen:style=Regular font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class="ATO013" text_class="ATO013" ellipsis=1.0";
+                       STYLE_TAGS
                }
-           style { name: "button_bottom";
-              base: "font=Tizen:style=Regular font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class="ATO012" text_class="ATO012" ellipsis=1.0";
-                  tag:  "br" "\n";
-                  tag:  "ps" "ps";
-                  tag:  "tab" "\t";
-                  tag:  "b" "+ font_weight=Bold";
-           }
-           style { name: "button_bottom_dim";
-              base: "font=Tizen:style=Regular font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class="ATO014" text_class="ATO014" ellipsis=1.0";
-                  tag:  "br" "\n";
-                  tag:  "ps" "ps";
-                  tag:  "tab" "\t";
-                  tag:  "b" "+ font_weight=Bold";
-           }
-           style { name: "button_bottom_press";
-              base: "font=Tizen:style=Regular font_size="BUTTON_BOTTOM_TEXT_SIZE" align=center color=#ffffff color_class="ATO013" text_class="ATO013" ellipsis=1.0";
-                  tag:  "br" "\n";
-                  tag:  "ps" "ps";
-                  tag:  "tab" "\t";
-                  tag:  "b" "+ font_weight=Bold";
-           }
        }
 
 /* elm/button/base/default - disabled*/
@@ -1374,398 +1856,59 @@ collections {
 
 /* elm/button/base/style_call_icon_only_end */
 /* This style is for End button in quickpanel view */
-       TOGGLE_BTN(callui_qp_btn_end, "AO013", "AO013P", ICON_IMG_PATH"/icon_end_call.png", "ATO017", "ATO017");
-       TOGGLE_BTN(callui_qp_btn_call, "AO012P1", "AO012P", ICON_IMG_PATH"/icon_call.png", "ATO017", "ATO017");
+       TOGGLE_BTN(callui_qp_btn_end, "AO013", "AO013P", ICON_IMG_PATH"/call_noti_btn_end.png", "ATO017", "ATO017");
+       TOGGLE_BTN(callui_qp_btn_call, "AO012P1", "AO012P", ICON_IMG_PATH"/call_noti_btn_send.png", "ATO017", "ATO017");
 
 /* elm/button/base/callui_qp_btn_mute */
 /* This style is for mute/unhold button in quickpanel view */
-       TOGGLE_BTN(callui_qp_btn_mute, "AO001", "AO014P", ICON_IMG_PATH"/icon_mic.png", "AO019", "AO019P");
-       TOGGLE_BTN(callui_qp_btn_mute_on, "AO001", "AO014P", ICON_IMG_PATH"/icon_mic.png", "AO018", "AO018P");
+       TOGGLE_BTN(callui_qp_btn_mute, "AO001", "AO014P", ICON_IMG_PATH"/call_noti_btn_mute.png", "AO019", "AO019P");
+       TOGGLE_BTN(callui_qp_btn_mute_on, "AO001", "AO014P", ICON_IMG_PATH"/call_noti_btn_mute.png", "AO018", "AO018P");
 
 /* elm/button/base/callui_qp_btn_speaker */
 /* This style is for speaker/unhold button in quickpanel view */
-       TOGGLE_BTN(callui_qp_btn_speaker, "AO001", "AO014P", ICON_IMG_PATH"/icon_speaker.png", "AO019", "AO019P");
-       TOGGLE_BTN(callui_qp_btn_speaker_on, "AO001", "AO014P", ICON_IMG_PATH"/icon_speaker.png", "AO018", "AO018P");
+       TOGGLE_BTN(callui_qp_btn_speaker, "AO001", "AO014P", ICON_IMG_PATH"/call_noti_btn_speaker.png", "AO019", "AO019P");
+       TOGGLE_BTN(callui_qp_btn_speaker_on, "AO001", "AO014P", ICON_IMG_PATH"/call_noti_btn_speaker.png", "AO018", "AO018P");
 
 /* This style is for speaker/resume button in quickpanel view */
-       TOGGLE_BTN(callui_qp_btn_resume, "AO001", "AO014P", ICON_IMG_PATH"/call_btn_resume.png", "AO019", "AO019P");
-       TOGGLE_BTN(callui_qp_btn_resume_on, "AO001", "AO014P", ICON_IMG_PATH"/call_btn_resume.png", "AO018", "AO018P");
-
-group { name: "elm/button/base/call_icon_only";
-      script {
-         public mouse_down = 0;
-         public multi_down = 0;
-      }
-      images {
-                image: BG_IMG_PATH"/core_button_bg.#.png" COMP;
-      }
-      parts {
-         part { name: "base";
-            scale: 1;
-            description { state: "default" 0.0;
-               image.normal: BG_IMG_PATH"/core_button_bg.#.png";
-               color_class: "W011E1";
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               visible: 0 ;
-            }
-         }
-         part { name: "bg";
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-               image.normal: BG_IMG_PATH"/call_btn_circle.png";
-               color_class: "AO043";
-               aspect_preference: SOURCE;
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               color_class: "AO043P";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color_class: "AO043D";
-            }
-         }
-         part { name: "padding_left_top";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_BOTTOM_PADDING_LEFT_RIGHT 0;
-               fixed: 1 1;
-            }
-         }
-         part { name: "padding_right_bottom";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_BOTTOM_PADDING_LEFT_RIGHT 0;
-               fixed: 1 1;
-            }
-         }
-         part { name: "icon_rect";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
-               }
-               min: 0 0;
-               fixed: 1 1;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_ICON_WIDTH BUTTON_ICON_HEIGHT;
-               max: BUTTON_ICON_WIDTH BUTTON_ICON_HEIGHT;
-               fixed: 1 1;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "visible" 0.0;
-            }
-         }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 1;
-               align: 0.5 0.5;
-               rel1 {
-                  relative: BUTTON_BOTTOM_ICON_OFFSET_L 0.0;
-               }
-               rel2 {
-                  relative: BUTTON_BOTTOM_ICON_OFFSET_R 1.0;
-               }
-               fixed: 1 0;
-            }
-            description { state: "visible" 0.0;
-               fixed: 1 1;
-               inherit: "default" 0.0;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "visible" 0.0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "visible" 0.0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "icon_rect";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               text {
-                  max: 1 0;
-                  style: "button_bottom";
-               }
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               text.style: "button_bottom_press";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text.style: "button_bottom_dim";
-            }
-            description { state: "invisible" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "event";
-            scale: 1;
-            type: RECT;
-            description { state: "default" 0.0;
-              rel1.to: "base";
-              rel2.to: "base";
-              color: COLOR_BG_ALPHA;
-            }
-         }
-      }
-      programs {
-         program { name: "pressed";
-            signal: "mouse,down,1*";
-            source: "event";
-            script {
-               if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0))
-                 {
-                     set_int(mouse_down, 1);
-                     run_program(PROGRAM:"button_press1");
-                 }
-            }
-         }
-         program { name: "button_press1";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"bg", st, 30, vl);
-               if (strcmp(st, "disabled")) {
-                  set_state(PART:"base", "pressed", 0.0);
-                  set_state(PART:"bg", "pressed", 0.0);
-                  set_state(PART:"elm.text", "pressed", 0.0);
-                  emit("elm,action,press", "");
-               }
-            }
-         }
-         program { name: "unpressed";
-            signal: "mouse,up,1";
-            source: "event";
-            script {
-               if (get_int(mouse_down) == 1) {
-                 set_int(mouse_down, 0);
-                 run_program(PROGRAM:"button_unpress1");
-               }
-            }
-         }
-         program { name: "button_unpress1";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"bg", st, 30, vl);
-               if (strcmp(st, "disabled")) {
-                  set_state(PART:"base", "default", 0.0);
-                  set_state(PART:"bg", "default", 0.0);
-                  set_state(PART:"elm.text", "default", 0.0);
-                  emit("elm,action,unpress", "");
-               }
-            }
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "event";
-            script {
-               new st[31];
-               new Float:vl;
-               if (get_int(multi_down) == 0) {
-                  get_state(PART:"bg", st, 30, vl);
-                  if (strcmp(st, "disabled")) {
-                     run_program(PROGRAM:"touch_sound");
-                     emit("elm,action,click", "");
-                  }
-               }
-            }
-         }
-         program { name: "touch_sound";
-            action: RUN_PLUGIN "touch_sound";
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            action: STATE_SET "invisible" 0.0;
-            target: "elm.text";
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.swallow.content";
-            target: "icon_rect";
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-            target: "icon_rect";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "bg";
-            target: "elm.text";
-            target: "elm.swallow.content";
-            target: "icon_rect";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg";
-            target: "elm.text";
-            target: "elm.swallow.content";
-            target: "icon_rect";
-         }
-         program { name: "multi_down";
-            signal: "elm,action,multi,down";
-            source: "elm";
-            script {
-               set_int(multi_down, 1);
-            }
-         }
-         program { name: "multi_up";
-            signal: "elm,action,multi,up";
-            source: "elm";
-            script {
-               set_int(multi_down, 0);
-            }
-         }
-      }
-   }
-
+       TOGGLE_BTN(callui_qp_btn_resume, "AO001", "AO014P", ICON_IMG_PATH"/call_noti_btn_resume.png", "AO019", "AO019P");
+       TOGGLE_BTN(callui_qp_btn_resume_on, "AO001", "AO014P", ICON_IMG_PATH"/call_noti_btn_resume.png", "AO018", "AO018P");
 
-// ACTIVE NOTIFICATION BUTTON
-
-group { name: "elm/button/base/answer_call_noti";
-       data.item: "vector_ux" "default";
-       data.item: "corner_radius" BUTTON_CORNER_RADIUS_INC;
+group { name: "elm/button/base/end_call";
        script {
                public mouse_down = 0;
                public multi_down = 0;
-               public disabled = 0;
-               public text = 0;
-               public content = 0;
-               public animate = 0;
-               public selected = 0;
-               public minw = 0;
-               public minh = 0;
-               public get_effect_min_size(base_effect, Float:ratio, min_w, min_h) {
-                       new x, y, w, h;
-                       get_geometry(base_effect, x, y, w, h);
-                       if (w > h) {
-                               set_float(min_w, (w - h * (1 - ratio)) / w);
-                               set_float(min_h, ratio);
-                       } else {
-                               set_float(min_w, ratio);
-                               set_float(min_h, (h - w * (1 - ratio)) / h);
-                       }
-               }
+       }
+       images {
+               image: BG_IMG_PATH"/core_button_bg.#.png" COMP;
        }
        parts {
                part { name: "base";
                        scale: 1;
-                       type: SPACER;
                        description { state: "default" 0.0;
-                               min: BUTTON_MIN_WIDTH_INC BUTTON_MIN_HEIGHT_INC;
+                               image.normal: BG_IMG_PATH"/core_button_bg.#.png";
+                               color_class: "W011E1";
                        }
-               }
-               //Base Shape Part
-               part { name: "tizen_vg_shape";
-                       type: SWALLOW;
-                       clip_to: "tizen_vg_shape_clipper";
-                       scale: 1;
-                       description { state: "default" 0.0;
-                               min: 0 BUTTON_MIN_HEIGHT_INC;
-                               rel1.relative: 0 0.0;
-                               rel2.relative: 1 1.0;
-                       }
-               }
-               part { name: "tizen_vg_shape_clipper";
-                       type: RECT;
-                       scale: 1;
-                       description { state: "default" 0.0;
-                               color: AO037;
-                       }
-                       description { state: "disabled" 0.0;
-                               color: AO037;
-                       }
-               }
-               part { name: "effect_spacer";
-                       type: SPACER;
-                       scale: 1;
-                       description { state: "default" 0.0;
-                               rel1.to: "tizen_vg_shape";
-                               rel2.to: "tizen_vg_shape";
+                       description { state: "pressed" 0.0;
+                               inherit: "default" 0.0;
+                               visible: 0 ;
                        }
                }
-               //Effect Shape Part
-               part { name: "tizen_vg_shape2";
-                       type: SWALLOW;
-                       clip_to: "tizen_vg_shape_clipper2";
+               part { name: "bg";
                        scale: 1;
                        description { state: "default" 0.0;
-                               fixed: 1 1;
-                               rel1.relative: 0.5 0.5;
-                               rel2.relative: 0.5 0.5;
-                       }
-                       description { state: "ready" 0.0;
-                               rel1.to: "effect_spacer";
-                               rel2.to: "effect_spacer";
+                               rel1.to: "base";
+                               rel2.to: "base";
+                               image.normal: BG_IMG_PATH"/call_btn_circle.png";
+                               color_class: "AO043";
+                               aspect_preference: SOURCE;
                        }
                        description { state: "pressed" 0.0;
-                               inherit: "ready" 0.0;
-                       }
-               }
-               part { name: "tizen_vg_shape_clipper2";
-                       type: RECT;
-                       description { state: "default" 0.0;
-                               visible: 0;
-                               color: 0 0 0 0;
-                       }
-                       description { state: "ready" 0.0;
                                inherit: "default" 0.0;
-                               visible: 1;
+                               color_class: "AO043P";
                        }
-                       description { state: "pressed" 0.0;
-                               color: AO025P;
+                       description { state: "disabled" 0.0;
+                               inherit: "default" 0.0;
+                               color_class: "AO043D";
                        }
                }
                part { name: "padding_left_top";
@@ -1774,7 +1917,7 @@ group { name: "elm/button/base/answer_call_noti";
                        description { state: "default" 0.0;
                                align: 0.0 0.0;
                                rel2.relative: 0.0 0.0;
-                               min: BUTTON_PADDING_LEFT_RIGHT_INC BUTTON_PADDING_TOP_HEIGHT_INC;
+                               min: BUTTON_BOTTOM_PADDING_LEFT_RIGHT 0;
                                fixed: 1 1;
                        }
                }
@@ -1782,11 +1925,9 @@ group { name: "elm/button/base/answer_call_noti";
                        type: SPACER;
                        scale: 1;
                        description { state: "default" 0.0;
-                               rel1.to: "tizen_vg_shape";
-                               rel2.to: "tizen_vg_shape";
                                align: 1.0 1.0;
                                rel1.relative: 1.0 1.0;
-                               min: BUTTON_PADDING_LEFT_RIGHT_INC BUTTON_PADDING_BOTTOM_HEIGHT_INC;
+                               min: BUTTON_BOTTOM_PADDING_LEFT_RIGHT 0;
                                fixed: 1 1;
                        }
                }
@@ -1804,81 +1945,42 @@ group { name: "elm/button/base/answer_call_noti";
                                        to_x: "padding_left_top";
                                        to_y: "padding_right_bottom";
                                }
-                               min: 0 BUTTON_ICON_DEFAULT_HEIGHT_INC;
+                               min: 0 0;
                                fixed: 1 1;
                        }
                        description { state: "visible" 0.0;
                                inherit: "default" 0.0;
-                               min: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC;
-                               max: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC;
+                               min: BUTTON_ICON_WIDTH BUTTON_ICON_HEIGHT;
+                               max: BUTTON_ICON_WIDTH BUTTON_ICON_HEIGHT;
                                fixed: 1 1;
                        }
-                       description { state: "icon_only" 0.0;
-                               inherit: "default" 0.0;
-                       }
-               }
-               part { name: "icon_text_padding";
-                       type: SPACER;
-                       scale: 1;
-                       description { state: "default" 0.0;
-                               align: 1.0 0.5;
-                               min: 0 0;
-                               rel1 {
-                                       relative: 0.0 0.0;
-                                       to: "elm.text";
-                               }
-                               rel2 {
-                                       relative: 0.0 1.0;
-                                       to: "elm.text";
-                               }
-                               fixed: 1 1;
-                       }
-                       description { state: "visible" 0.0;
-                               inherit: "default" 0.0;
-                               min: BUTTON_PADDING_ICON_RIGHT_INC 0;
+                       description { state: "disabled" 0.0;
+                               inherit: "visible" 0.0;
                        }
                }
                part { name: "elm.swallow.content";
                        type: SWALLOW;
                        scale: 1;
-                       clip_to: "clipper";
                        description { state: "default" 0.0;
-                               align: 0.0 1.0;
+                               visible: 1;
+                               align: 0.5 0.5;
                                rel1 {
-                                       relative: 1.0 1.0;
-                                       to: "padding_left_top";
+                                       relative: BUTTON_BOTTOM_ICON_OFFSET_L 0.0;
                                }
                                rel2 {
-                                       relative: 1.0 1.0;
-                                       to_x: "padding_left_top";
-                                       to_y: "padding_right_bottom";
+                                       relative: BUTTON_BOTTOM_ICON_OFFSET_R 1.0;
                                }
-                               min: 0 BUTTON_ICON_DEFAULT_HEIGHT_INC;
                                fixed: 1 0;
                        }
                        description { state: "visible" 0.0;
-                               inherit: "default" 0.0;
-                               align: 1.0 0.5;
-                               rel1 {
-                                       relative: 0.0 1.0;
-                                       to_x: "icon_text_padding";
-                                       to_y: "padding_left_top";
-                               }
-                               rel2 {
-                                       relative: 0.0 0.0;
-                                       to_x: "icon_text_padding";
-                                       to_y: "padding_right_bottom";
-                               }
-                               min: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC;
                                fixed: 1 1;
+                               inherit: "default" 0.0;
                        }
-                       description { state: "icon_only" 0.0;
-                               rel1.to: "tizen_vg_shape";
-                               rel2.to: "tizen_vg_shape";
-                               min: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC;
-                               max: BUTTON_ICON_DEFAULT_WIDTH_INC BUTTON_ICON_DEFAULT_HEIGHT_INC;
-                               align: 0.5 0.5;
-                               fixed: 1 1;
+                       description { state: "icononly" 0.0;
+                               inherit: "visible" 0.0;
+                       }
+                       description { state: "disabled" 0.0;
+                               inherit: "visible" 0.0;
                        }
                }
                part { name: "elm.text";
@@ -1897,137 +1999,55 @@ group { name: "elm/button/base/answer_call_noti";
                                        to: "padding_right_bottom";
                                }
                                text {
-                                       style: "ATO013";
                                        max: 1 0;
+                                       style: "button_bottom";
                                }
-                               color: 250 250 250 255;
                        }
                        description { state: "pressed" 0.0;
                                inherit: "default" 0.0;
-                               text.style: "ATO013";
-                               color: 250 250 250 255;
+                               text.style: "button_bottom_press";
                        }
                        description { state: "disabled" 0.0;
                                inherit: "default" 0.0;
-                               text.style: "ATO013";
-                               color: 250 250 250 163;
+                               text.style: "button_bottom_dim";
                        }
-               }
-               part { name: "clipper";
-                       type: RECT;
-                       description { state: "default" 0.0;
-                       }
-                       description { state: "pressed" 0.0;
-                       }
-                       description { state: "disabled" 0.0;
+                       description { state: "invisible" 0.0;
                                inherit: "default" 0.0;
-                               color: 255 255 255 163;
+                               visible: 0;
                        }
                }
                part { name: "event";
+                       scale: 1;
                        type: RECT;
                        description { state: "default" 0.0;
-                               rel1.to: "tizen_vg_shape";
-                               rel2.to: "tizen_vg_shape";
-                               color: 0 0 0 0;
+                               rel1.to: "base";
+                               rel2.to: "base";
+                               color: COLOR_BG_ALPHA;
                        }
                }
        }
        programs {
-               program { name: "pressed_effect";
-                       action: STATE_SET "ready" 0.0;
-                       target: "tizen_vg_shape_clipper2";
-                       action: STATE_SET "custom" 0.0;
-                       target: "tizen_vg_shape2";
-                       after: "pressed_effect2";
-               }
-               program { name: "pressed_effect2";
-                       action: STATE_SET "pressed" 0.0;
-                       target: "elm.text";
-                       target: "clipper";
-                       target: "tizen_vg_shape2";
-                       target: "tizen_vg_shape_clipper2";
-                       transition: GLIDE_EASE_OUT(0.15);
-                       after: "pressed_effect3";
-               }
-               program { name: "pressed_effect3";
-                       script {
-                               set_int(animate, 0);
-                       }
-               }
-               program { name: "delay_unpressed_effect";
-                       in: 0.1 0.0;
-                       after: "unpressed_effect";
-               }
-               program { name: "unpressed_effect";
-                       script {
-                               if (get_int(disabled) == 0) {
-                                       run_program(PROGRAM:"unpressed_effect2");
-                                       run_program(PROGRAM:"unpressed_effect3");
-                               } else {
-                                       run_program(PROGRAM:"disabled_effect");
-                                       run_program(PROGRAM:"disabled_effect2");
-                                       run_program(PROGRAM:"disabled_effect3");
-                               }
-                       }
-               }
-               program { name: "unpressed_effect2";
-                       action: STATE_SET "ready" 0.0;
-                       target: "tizen_vg_shape2";
-                       target: "tizen_vg_shape_clipper2";
-                       transition: GLIDE_EASE_OUT(0.45);
-               }
-               program { name: "unpressed_effect3";
-                       action: STATE_SET "default" 0.0;
-                       target: "elm.text";
-                       transition: GLIDE_EASE_OUT(0.45);
-                       after: "unpressed_effect4";
-               }
-               program { name: "unpressed_effect4";
-                       action: STATE_SET "default" 0.0;
-                       target: "clipper";
-                       after: "finished_animation";
-               }
-               program { name: "disabled_effect";
-                       action: STATE_SET "ready" 0.0;
-                       target: "tizen_vg_shape2";
-                       target: "tizen_vg_shape_clipper2";
-                       transition: GLIDE_EASE_OUT(0.45);
-               }
-               program { name: "disabled_effect2";
-                       action: STATE_SET "disabled" 0.0;
-                       target: "elm.text";
-                       transition: GLIDE_EASE_OUT(0.45);
-               }
-               program { name: "disabled_effect3";
-                       action: STATE_SET "disabled" 0.0;
-                       target: "clipper";
-                       target: "tizen_vg_shape_clipper";
-                       transition: GLIDE_EASE_OUT(0.45);
-                       after: "finished_animation";
-               }
-               program { name: "finished_animation";
-                       action: STATE_SET "default" 0.0;
-                       target: "tizen_vg_shape2";
-                       target: "tizen_vg_shape_clipper2";
-               }
                program { name: "pressed";
                        signal: "mouse,down,1*";
                        source: "event";
                        script {
-                               if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0) && (get_int(disabled) == 0)) {
-                                       new Float:rel_w, Float:rel_h;
-                                       stop_program(PROGRAM:"delay_unpressed_effect");
+                               if ((get_int(multi_down) == 0) && (get_int(mouse_down) == 0))
+                               {
                                        set_int(mouse_down, 1);
-                                       set_int(animate, 1);
-                                       custom_state(PART:"tizen_vg_shape2", "default", 0.0);
-                                       get_effect_min_size(PART:"effect_spacer", 0.7, minw, minh);
-                                       rel_w = (1 - get_float(minw)) / 2;
-                                       rel_h = (1 - get_float(minh)) / 2;
-                                       set_state_val(PART:"tizen_vg_shape2", STATE_REL1, rel_w, rel_h);
-                                       set_state_val(PART:"tizen_vg_shape2", STATE_REL2, 1 - rel_w, 1 - rel_h);
+                                       run_program(PROGRAM:"button_press1");
+                               }
+                       }
+               }
+               program { name: "button_press1";
+                       script {
+                               new st[31];
+                               new Float:vl;
+                               get_state(PART:"bg", st, 30, vl);
+                               if (strcmp(st, "disabled")) {
+                                       set_state(PART:"base", "pressed", 0.0);
+                                       set_state(PART:"bg", "pressed", 0.0);
+                                       set_state(PART:"elm.text", "pressed", 0.0);
                                        emit("elm,action,press", "");
-                                       run_program(PROGRAM:"pressed_effect");
                                }
                        }
                }
@@ -2036,20 +2056,21 @@ group { name: "elm/button/base/answer_call_noti";
                        source: "event";
                        script {
                                if (get_int(mouse_down) == 1) {
-                                       set_int(mouse_down, 0);
-                                       if (get_int(disabled) == 0) {
-                                               if (get_int(animate) == 0) {
-                                                       run_program(PROGRAM:"unpressed_effect");
-                                               } else {
-                                                       set_state(PART:"elm.text", "pressed", 0.0);
-                                                       set_state(PART:"clipper", "pressed", 0.0);
-                                                       set_state(PART:"tizen_vg_shape2", "pressed", 0.0);
-                                                       set_state(PART:"tizen_vg_shape_clipper2", "pressed", 0.0);
-                                                       set_int(animate, 0);
-                                                       run_program(PROGRAM:"delay_unpressed_effect");
-                                               }
-                                               emit("elm,action,unpress", "");
-                                       }
+                               set_int(mouse_down, 0);
+                               run_program(PROGRAM:"button_unpress1");
+                               }
+                       }
+               }
+               program { name: "button_unpress1";
+                       script {
+                               new st[31];
+                               new Float:vl;
+                               get_state(PART:"bg", st, 30, vl);
+                               if (strcmp(st, "disabled")) {
+                                       set_state(PART:"base", "default", 0.0);
+                                       set_state(PART:"bg", "default", 0.0);
+                                       set_state(PART:"elm.text", "default", 0.0);
+                                       emit("elm,action,unpress", "");
                                }
                        }
                }
@@ -2057,10 +2078,13 @@ group { name: "elm/button/base/answer_call_noti";
                        signal: "mouse,clicked,1";
                        source: "event";
                        script {
+                               new st[31];
+                               new Float:vl;
                                if (get_int(multi_down) == 0) {
-                                       if (get_int(disabled) == 0) {
-                                               run_program(PROGRAM:"touch_sound");
-                                               run_program(PROGRAM:"clicked_signal");
+                                       get_state(PART:"bg", st, 30, vl);
+                                       if (strcmp(st, "disabled")) {
+                                       run_program(PROGRAM:"touch_sound");
+                                       emit("elm,action,click", "");
                                        }
                                }
                        }
@@ -2068,84 +2092,55 @@ group { name: "elm/button/base/answer_call_noti";
                program { name: "touch_sound";
                        action: RUN_PLUGIN "touch_sound";
                }
-               program { name: "clicked_signal";
-                       in: 0.001 0.0;
-                       action: SIGNAL_EMIT "elm,action,click" "";
+               program { name: "text_show";
+                       signal: "elm,state,text,visible";
+                       source: "elm";
+                       action: STATE_SET "default" 0.0;
+                       target: "elm.text";
+               }
+               program { name: "text_hide";
+                       signal: "elm,state,text,hidden";
+                       source: "elm";
+                       action: STATE_SET "invisible" 0.0;
+                       target: "elm.text";
                }
                program { name: "icon_show";
                        signal: "elm,state,icon,visible";
                        source: "elm";
-                       script {
-                               set_int(content, 1);
-                               set_state(PART:"icon_text_padding", "visible", 0.0);
-                               if (get_int(text) == 1) {
-                                       set_state(PART:"icon_rect", "visible", 0.0);
-                                       set_state(PART:"elm.swallow.content", "visible", 0.0);
-                               } else {
-                                       set_state(PART:"icon_rect", "icon_only", 0.0);
-                                       set_state(PART:"elm.swallow.content", "icon_only", 0.0);
-                                       set_state(PART:"padding_left_top", "icon_only", 0.0);
-                               }
-                       }
+                       action: STATE_SET "visible" 0.0;
+                       target: "elm.swallow.content";
+                       target: "icon_rect";
                }
                program { name: "icon_hide";
                        signal: "elm,state,icon,hidden";
                        source: "elm";
-                       script {
-                               set_int(content, 0);
-                               set_state(PART:"icon_text_padding", "default", 0.0);
-                               set_state(PART:"icon_rect", "default", 0.0);
-                               set_state(PART:"elm.swallow.content", "default", 0.0);
-                       }
-               }
-               program { name: "text_show";
-                       signal: "elm,state,text,visible";
-                       source: "elm";
-                       script {
-                               set_int(text, 1);
-                               if (get_int(content) == 1) {
-                                       set_state(PART:"icon_rect", "visible", 0.0);
-                                       set_state(PART:"elm.swallow.content", "visible", 0.0);
-                               }
-                       }
-               }
-               program { name: "text_hide";
-                       signal: "elm,state,text,hidden";
-                       source: "elm";
-                       script {
-                               set_int(text, 0);
-                               if (get_int(content) == 1) {
-                                       set_state(PART:"icon_rect", "icon_only", 0.0);
-                                       set_state(PART:"elm.swallow.content", "icon_only", 0.0);
-                               }
-                       }
+                       action: STATE_SET "default" 0.0;
+                       target: "elm.swallow.content";
+                       target: "icon_rect";
                }
                program { name: "disable";
                        signal: "elm,state,disabled";
                        source: "elm";
-                       script {
-                               set_int(disabled, 1);
-                               if (get_int(animate) == 1) return;
-                               set_state(PART:"clipper", "disabled", 0.0);
-                               set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0);
-                               set_state(PART:"elm.text", "disabled", 0.0);
-                       }
+                       action: STATE_SET "disabled" 0.0;
+                       target: "bg";
+                       target: "elm.text";
+                       target: "elm.swallow.content";
+                       target: "icon_rect";
                }
                program { name: "enable";
                        signal: "elm,state,enabled";
                        source: "elm";
-                       script {
-                               set_int(disabled, 0);
-                               set_state(PART:"clipper", "default", 0.0);
-                               set_state(PART:"tizen_vg_shape_clipper", "default", 0.0);
-                               set_state(PART:"elm.text", "default", 0.0);
-                       }
+                       action: STATE_SET "default" 0.0;
+                       target: "bg";
+                       target: "elm.text";
+                       target: "elm.swallow.content";
+                       target: "icon_rect";
                }
                program { name: "multi_down";
                        signal: "elm,action,multi,down";
                        source: "elm";
                        script {
-                       set_int(multi_down, 1);
+                               set_int(multi_down, 1);
                        }
                }
                program { name: "multi_up";
@@ -2155,66 +2150,13 @@ group { name: "elm/button/base/answer_call_noti";
                                set_int(multi_down, 0);
                        }
                }
-               program { name: "pass_event_enable";
-                       signal: "elm,event,pass,enabled";
-                       source: "elm";
-                       script {
-                               set_mouse_events(PART:"event", 0);
-                       }
-               }
-               program { name: "pass_event_disable";
-                       signal: "elm,event,pass,disabled";
-                       source:"elm";
-                       script {
-                               set_mouse_events(PART:"event", 1);
-                       }
-               }
-               program { name: "repeat_event_enable";
-                       signal: "elm,event,repeat,enabled";
-                       source: "elm";
-                       script {
-                               set_repeat_events(PART:"event", 1);
-                       }
-               }
-               program { name: "repeat_event_disable";
-                       signal: "elm,event,repeat,disabled";
-                       source:"elm";
-                       script {
-                               set_repeat_events(PART:"event", 0);
-                       }
-               }
        }
 }
 
-group { name: "elm/button/base/reject_call_noti";
-       inherit: "elm/button/base/answer_call_noti";
-       parts {
-               part { name: "tizen_vg_shape_clipper";
-                       type: RECT;
-                       scale: 1;
-                       description { state: "default" 0.0;
-                               color: AO038;
-                       }
-                       description { state: "disabled" 0.0;
-                               color: AO038;
-                       }
-               }
-       }
-}
 
-group { name: "elm/button/base/reject_msg_noti";
-       inherit: "elm/button/base/answer_call_noti";
-       parts {
-               part { name: "tizen_vg_shape_clipper";
-                       type: RECT;
-                       scale: 1;
-                       description { state: "default" 0.0;
-                               color: AO025;
-                       }
-                       description { state: "disabled" 0.0;
-                               color: AO025;
-                       }
-               }
-       }
-}
-}
+// ACTIVE NOTIFICATION BUTTON
+
+       DEFAULT_CUSTOM_BG_BTN("active_noti_accept", AO037, AO037);
+       DEFAULT_CUSTOM_BG_BTN("active_noti_reject", AO038, AO038);
+       DEFAULT_CUSTOM_BG_BTN("active_noti_reject_with_msg", AO025, AO025);
+}
\ No newline at end of file
diff --git a/res/images/call_button_icon_01.png b/res/images/call_button_icon_01.png
deleted file mode 100644 (file)
index a1f21a9..0000000
Binary files a/res/images/call_button_icon_01.png and /dev/null differ
diff --git a/res/images/call_button_icon_03.png b/res/images/call_button_icon_03.png
deleted file mode 100644 (file)
index 1b8c83a..0000000
Binary files a/res/images/call_button_icon_03.png and /dev/null differ
index 987364c..0b5de83 100755 (executable)
@@ -130,10 +130,10 @@ Evas_Object *_callui_create_end_call_button(Evas_Object *parent, Evas_Smart_Cb c
        Evas_Object *btn = elm_object_part_content_get(parent, CALLUI_PART_SWALLOW_END_BTN);
        if (!btn) {
                btn = elm_button_add(parent);
-               elm_object_style_set(btn, "call_icon_only");
+               elm_object_style_set(btn, "end_call");
 
                Evas_Object *icon = elm_image_add(btn);
-               elm_image_file_set(icon, CALLUI_CALL_EDJ_PATH, "call_button_icon_01.png");
+               elm_image_file_set(icon, CALLUI_CALL_EDJ_PATH, "call_btn_ic_reject");
                elm_object_part_content_set(btn, "elm.swallow.content", icon);
                elm_object_part_content_set(parent, CALLUI_PART_SWALLOW_END_BTN, btn);
 
index 63990a6..23908bf 100644 (file)
@@ -37,8 +37,8 @@
 #define CALLUI_GROUP_REJ_MSG_SCROLLER_BG       "reject_msg_scroller_bg"
 #define CALLUI_GROUP_MAIN_ACTIVE_NOTI_CALL     "main_active_noti_call"
 
-#define CALLUI_DURING_ICON     "call_button_icon_03.png"
-#define CALLUI_END_ICON                "call_button_icon_01.png"
+#define CALLUI_ACCEPT_CALL_BTN_STYLE           "call_end_ic_call"
+#define CALLUI_REJECT_CALL_BTN_STYLE           "call_end_ic_end"
 
 #define CALLUI_MOVE_TRANSITION_TIME_SEC                0.3
 
@@ -815,12 +815,12 @@ static callui_result_e __create_main_content(callui_view_incoming_call_noti_h vd
 
        elm_box_pack_end(vd->box, vd->layout);
 
-       Evas_Object *answer_btn = __create_btn(vd, "answer_call_noti", CALLUI_DURING_ICON,
+       Evas_Object *answer_btn = __create_btn(vd, "active_noti_accept", CALLUI_ACCEPT_CALL_BTN_STYLE,
                        NULL, __call_action_btn_click_cb, CALLUI_APP_CONTROL_OPERATION_DURING_CALL);
        CALLUI_RETURN_VALUE_IF_FAIL(answer_btn, CALLUI_RESULT_ALLOCATION_FAIL);
        elm_object_part_content_set(vd->layout, "swallow.call_accept_btn", answer_btn);
 
-       Evas_Object *reject_btn = __create_btn(vd, "reject_call_noti", CALLUI_END_ICON,
+       Evas_Object *reject_btn = __create_btn(vd, "active_noti_reject", CALLUI_REJECT_CALL_BTN_STYLE,
                        NULL, __call_action_btn_click_cb, CALLUI_APP_CONTROL_OPERATION_END_CALL);
        CALLUI_RETURN_VALUE_IF_FAIL(reject_btn, CALLUI_RESULT_ALLOCATION_FAIL);
        elm_object_part_content_set(vd->layout, "swallow.call_reject_btn", reject_btn);
@@ -895,7 +895,7 @@ static callui_result_e __update_displayed_data(callui_view_incoming_call_noti_h
        }
 
        if (!is_unknown) {
-               Evas_Object *reject_msg_btn = __create_btn(vd, "reject_msg_noti", NULL,
+               Evas_Object *reject_msg_btn = __create_btn(vd, "active_noti_reject_with_msg", NULL,
                                "IDS_VCALL_BUTTON2_REJECT_CALL_WITH_MESSAGE", __show_reject_msg_btn_click_cb, vd);
                CALLUI_RETURN_VALUE_IF_FAIL(reject_msg_btn, CALLUI_RESULT_ALLOCATION_FAIL);
                elm_object_part_content_set(vd->layout, "swallow.reject_msg_btn", reject_msg_btn);
index 5fb1fbf..1dbc40e 100755 (executable)
@@ -701,8 +701,10 @@ static void __app_service(app_control_h app_control, void *data)
                if (ad->view_manager && _callui_vm_get_cur_view_type(ad->view_manager) == CALLUI_VIEW_INCOMING_CALL_NOTI) {
                        _callui_vm_change_view(ad->view_manager, CALLUI_VIEW_INCOMING_CALL);
                }
-               _callui_window_activate(ad->window);
-               _callui_window_set_above_lockscreen_state(ad->window, true);
+               if (_callui_common_get_idle_lock_type() != CALLUI_LOCK_TYPE_UNLOCK) {
+                       _callui_window_activate(ad->window);
+                       _callui_window_set_above_lockscreen_state(ad->window, true);
+               }
        } else if (strcmp(operation, CALLUI_APP_CONTROL_OPERATION_DURING_CALL) == 0) {
                ret = _callui_manager_answer_call(ad->call_manager, CALLUI_CALL_ANSWER_NORMAL);
                if (CALLUI_RESULT_OK != ret) {