diff options
| -rw-r--r-- | call-ui/presenters/misc/CallInfoPresenter.cpp | 25 | ||||
| -rw-r--r-- | edc/buttons.edc | 2 | ||||
| -rw-r--r-- | edc/call_info.edc | 26 | ||||
| -rw-r--r-- | edc/color_classes.edc | 2 | ||||
| -rw-r--r-- | edc/images/w_outgoing_icon_gear_02.png | bin | 0 -> 2257 bytes | |||
| -rw-r--r-- | edc/images/w_outgoing_icon_towatch_02.png | bin | 1826 -> 0 bytes |
6 files changed, 4 insertions, 51 deletions
diff --git a/call-ui/presenters/misc/CallInfoPresenter.cpp b/call-ui/presenters/misc/CallInfoPresenter.cpp index b8176e8..002254f 100644 --- a/call-ui/presenters/misc/CallInfoPresenter.cpp +++ b/call-ui/presenters/misc/CallInfoPresenter.cpp @@ -46,8 +46,6 @@ namespace callui { namespace { namespace impl { constexpr EdjeSignal SIGN_CID_ENABLE {"caller_id_enable"}; constexpr EdjeSignal SIGN_CID_DISABLE {"caller_id_disable"}; constexpr EdjeSignal SIGN_EMERGENCY {"emergency"}; - constexpr EdjeSignal SIGN_EMERGENCY_BIG_TXT {"big_txt_emergency"}; - constexpr EdjeSignal SIGN_BIG_TXT {"big_txt"}; constexpr EdjeSignal SIGN_CENTRE_1LINE {"centre_1line"}; constexpr EdjeSignal SIGN_CENTRE_2LINE {"centre_2line"}; constexpr EdjeSignal SIGN_INCOMING {"incoming"}; @@ -548,29 +546,8 @@ namespace callui { m_widget->emit(impl::SIGN_CENTRE_2LINE, impl::SRC_TOP_PAD); } return; - } else if (m_mode == CallMode::END) { - if (info->isEmergency() - || info->getContactInfo() - || (info->getConferenceMemberCount() > 1)) { - // Font size and color - if (info->isEmergency()) { - m_widget->emit(impl::SIGN_EMERGENCY_BIG_TXT, - impl::SRC_TXT_1LINE); - } else { - m_widget->emit(impl::SIGN_BIG_TXT, impl::SRC_TXT_1LINE); - } - // Info text top padding - if (impl::getTextWidth(*m_widget, - impl::CU_BIG_FONT_STYLE, - impl::CU_BIG_FONT_SIZE, - text) <= impl::SUB_TXT_WIDTH) { - m_widget->emit(impl::SIGN_CENTRE_1LINE, impl::SRC_TOP_PAD); - } else { - m_widget->emit(impl::SIGN_CENTRE_2LINE, impl::SRC_TOP_PAD); - } - return; - } } + // Font size and color if (info->isEmergency()) { m_widget->emit(impl::SIGN_EMERGENCY, impl::SRC_TXT_1LINE); diff --git a/edc/buttons.edc b/edc/buttons.edc index 8b1ef39..5f92973 100644 --- a/edc/buttons.edc +++ b/edc/buttons.edc @@ -1281,7 +1281,7 @@ CU_BTN_VOLUME_CONTROL("callui/plus", "b_slider_icon_plus.png") CU_BTN_ACCESSORY("callui/volume", "w_outgoing_icon_volume_02.png") CU_BTN_ACCESSORY("callui/mute", "w_outgoing_icon_mute_02.png") -CU_BTN_ACCESSORY_TOGGLE_ICON("callui/bluetooth", "w_outgoing_icon_towatch_02.png", +CU_BTN_ACCESSORY_TOGGLE_ICON("callui/bluetooth", "w_outgoing_icon_gear_02.png", "w_outgoing_icon_headset_02.png") CU_BTN_ACCESSORY("callui/add_contact", "w_outgoing_icon_contact_add_02.png") diff --git a/edc/call_info.edc b/edc/call_info.edc index f6b7e39..9ff3dab 100644 --- a/edc/call_info.edc +++ b/edc/call_info.edc @@ -29,7 +29,7 @@ styles { } style { name: "main_text_emergency"; - base: "font=Tizen font_weight=Regular font_width=Condensed font_size=24 align=center valign=center color=#FF870F ellipsis=1.0"; + base: "font=Tizen font_weight=Regular font_width=Condensed font_size=24 align=center valign=center color=#FF4E47 ellipsis=1.0"; } style { name: "main_text_big"; @@ -39,10 +39,6 @@ styles { name: "main_text_big_photo"; base: "font=Tizen font_weight=Regular font_width=Condensed font_size=40 align=center valign=center color=#FFFFFF wrap=mixed ellipsis=1.0"; } - style { - name: "main_text_big_emergency"; - base: "font=Tizen font_weight=Regular font_width=Condensed font_size=40 align=center valign=center color=#FF870F wrap=mixed ellipsis=1.0"; - } } @@ -251,10 +247,6 @@ group { "elm/layout/callui/call_info"; inherit: "default"; text.style: "main_text_big_photo"; } - desc { "big_emergency"; - inherit: "default"; - text.style: "main_text_big_emergency"; - } } rect { "ao_text_1line"; mouse; @@ -502,22 +494,6 @@ group { "elm/layout/callui/call_info"; } } program { - signal: "big_txt"; - source: "text_1line"; - script { - set_state(PART:"text_1line", "big", 0.0); - set_state(PART:"text_info", "default", 0.0); - } - } - program { - signal: "big_txt_emergency"; - source: "text_1line"; - script { - set_state(PART:"text_1line", "big_emergency", 0.0); - set_state(PART:"text_info", "default", 0.0); - } - } - program { signal: "default"; source: "text_2line"; script { diff --git a/edc/color_classes.edc b/edc/color_classes.edc index 308a4de..1f65902 100644 --- a/edc/color_classes.edc +++ b/edc/color_classes.edc @@ -108,7 +108,7 @@ color_classes { color: 255 255 255 255; } color_class { name: "AO012"; - color: 0 149 255 255; + color: 77 207 255 255; } color_class { name: "AO012D"; color: 255 255 255 77; diff --git a/edc/images/w_outgoing_icon_gear_02.png b/edc/images/w_outgoing_icon_gear_02.png Binary files differnew file mode 100644 index 0000000..ae4cbbc --- /dev/null +++ b/edc/images/w_outgoing_icon_gear_02.png diff --git a/edc/images/w_outgoing_icon_towatch_02.png b/edc/images/w_outgoing_icon_towatch_02.png Binary files differdeleted file mode 100644 index 36bc29a..0000000 --- a/edc/images/w_outgoing_icon_towatch_02.png +++ /dev/null |
