From: Igor Olshevskyi Date: Tue, 26 Sep 2017 10:09:24 +0000 (+0300) Subject: TizenRefApp-9435 [Call UI] Remove unused VoiceAnswer feature from project X-Git-Tag: submit/tizen_4.0/20171018.080056~9^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea5f63d3ee90e429ea156b399f04e43192ff4627;p=profile%2Fwearable%2Fapps%2Fnative%2Fcall-ui.git TizenRefApp-9435 [Call UI] Remove unused VoiceAnswer feature from project Change-Id: I98d4172ed51af44d728b92a472b2a3adde19fffd --- diff --git a/call-ui/model/IndicatorState.h b/call-ui/model/IndicatorState.h index 36f7424..1099310 100644 --- a/call-ui/model/IndicatorState.h +++ b/call-ui/model/IndicatorState.h @@ -70,13 +70,6 @@ namespace callui { */ BatteryState getBatteryState(IndicatorState state); - /** - * @brief Gets voice control state - * @param[in] state Indicator state - * @return true if voice control is on, false otherwise - */ - bool getVoiceControlState(IndicatorState state); - /** * @brief Gets current active sim slot type * @param[in] state Indicator state diff --git a/call-ui/model/impl/CallUI.cpp b/call-ui/model/impl/CallUI.cpp index db4066d..5073db7 100644 --- a/call-ui/model/impl/CallUI.cpp +++ b/call-ui/model/impl/CallUI.cpp @@ -22,7 +22,6 @@ #include "CallManager.h" #include "SoundManager.h" -#include "VoiceControlStateProvider.h" #include "IndicatorStateProvider.h" #include "common.h" @@ -103,12 +102,6 @@ namespace callui { "SoundManage::newInstance() failed!"); } - m_voiceControlPrv = VoiceControlStateProvider::newInstance(); - if (!m_voiceControlPrv) { - LOG_RETURN(RES_FAIL, - "VoiceControlStateProvider::newInstance() failed!"); - } - FAIL_RETURN(initInidcatorStateProvider(), "Init Indicator State Provider failed!"); @@ -149,16 +142,6 @@ namespace callui { IndicatorProperty::BATTERY, batteryStSrc), "setStateSource() failed!"); - auto voiceControlStSrc = - VoiceControlStateSource::newInstance(m_voiceControlPrv); - if (!voiceControlStSrc) { - LOG_RETURN(RES_FAIL, - "VoiceControlStateSource::newInstance() failed!"); - } - FAIL_RETURN(m_indicatorStPrv->setStateSource( - IndicatorProperty::VOICE_CONTROL, voiceControlStSrc), - "setStateSource() failed!"); - m_simSlotStSrc = SimSlotStateSource::newInstance( m_callManager->getSimSlot(), getForwardedCallStatus()); FAIL_RETURN(m_indicatorStPrv->setStateSource( diff --git a/call-ui/model/impl/CallUI.h b/call-ui/model/impl/CallUI.h index 8114f82..aaa8f39 100644 --- a/call-ui/model/impl/CallUI.h +++ b/call-ui/model/impl/CallUI.h @@ -25,11 +25,9 @@ #include "ConnectionStateSource.h" #include "RssiStateSource.h" #include "BatteryStateSource.h" -#include "VoiceControlStateSource.h" #include "SimSlotStateSource.h" #include "HdVoiceStateSource.h" #include "IndicatorStateProvider.h" -#include "VoiceControlStateProvider.h" #include "call-ui/model/types.h" @@ -107,7 +105,6 @@ namespace callui { SimSlotStateSourceSRef m_simSlotStSrc; HdVoiceStateSourceSRef m_hdCallStSrc; IndicatorStateProviderSRef m_indicatorStPrv; - VoiceControlStateProviderSRef m_voiceControlPrv; friend class CallUIBuilder; friend class ucl::ReffedObj; diff --git a/call-ui/model/impl/IndicatorStateProvider.h b/call-ui/model/impl/IndicatorStateProvider.h index 30b27a7..b2b35b5 100644 --- a/call-ui/model/impl/IndicatorStateProvider.h +++ b/call-ui/model/impl/IndicatorStateProvider.h @@ -70,7 +70,7 @@ namespace callui { private: enum { - STATE_COUNT = 6 + STATE_COUNT = 5 }; class SourceHandler; diff --git a/call-ui/model/impl/VoiceControlStateProvider.cpp b/call-ui/model/impl/VoiceControlStateProvider.cpp deleted file mode 100644 index 36c619d..0000000 --- a/call-ui/model/impl/VoiceControlStateProvider.cpp +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright 2017 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://floralicense.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "VoiceControlStateProvider.h" - -#include "common.h" - -// Temporary until VCONFLAG will not be added to a system -#define VCONFKEY_CISSAPPL_CALL_VOICE_ANSWER_BOOL VCONFKEY_CISSAPPL_ANSWERING_KEY_BOOL - -namespace callui { - - using namespace ucl; - - VoiceControlStateProvider::VoiceControlStateProvider(): - m_enableState(false) - { - } - - VoiceControlStateProvider::~VoiceControlStateProvider() - { - delSysStateCallback(); - } - - VoiceControlStateProviderSRef VoiceControlStateProvider::newInstance() - { - auto result = makeShared(); - FAIL_RETURN_VALUE(result->prepare(), {}, "result->prepare() failed!"); - return result; - } - - Result VoiceControlStateProvider::prepare() - { - FAIL_RETURN(addSysStateCallback(), - "addSysStateCallbacks() failed!"); - - FAIL_RETURN(initState(), "initState() failed!"); - return RES_OK; - } - - Result VoiceControlStateProvider::initState() - { - auto val = 0; - if (vconf_get_bool( - VCONFKEY_CISSAPPL_CALL_VOICE_ANSWER_BOOL, &val) != 0) { - LOG_RETURN(RES_FAIL, "vconf_get_bool() failed!" - "err[%d]", vconf_get_ext_errno()); - } - updateState(val); - - return RES_OK; - } - - bool VoiceControlStateProvider::getState() const - { - return m_enableState; - } - - void VoiceControlStateProvider::addStateChangeHandler( - const NotiHandler &handler) - { - m_event += handler; - } - - void VoiceControlStateProvider::removeStateChangeHandler( - const NotiHandler &handler) - { - m_event -= handler; - } - - Result VoiceControlStateProvider::addSysStateCallback() - { - if (vconf_notify_key_changed( - VCONFKEY_CISSAPPL_CALL_VOICE_ANSWER_BOOL, - CALLBACK_B(VoiceControlStateProvider::onStateChanged), - this) != 0) { - - LOG_RETURN(RES_FAIL, "vconf_notify_key_changed() failed. " - "err[%d]", vconf_get_ext_errno()); - } - return RES_OK; - } - - void VoiceControlStateProvider::delSysStateCallback() - { - vconf_ignore_key_changed( - VCONFKEY_CISSAPPL_CALL_VOICE_ANSWER_BOOL, - CALLBACK_B(VoiceControlStateProvider::onStateChanged)); - } - - void VoiceControlStateProvider::onStateChanged( - keynode_t *node) - { - auto val = 0; - if (vconf_get_bool( - VCONFKEY_CISSAPPL_CALL_VOICE_ANSWER_BOOL, &val) != 0) { - LOG_RETURN_VOID(RES_FAIL, "vconf_get_bool() failed!" - "err[%d]", vconf_get_ext_errno()); - } - - if (updateState(val) && !m_event.isEmpty()) { - m_event.dispatch(); - } - } - - bool VoiceControlStateProvider::updateState(bool isEnable) - { - if (m_enableState != isEnable) { - m_enableState = isEnable; - return true; - } - return false; - } - - -} diff --git a/call-ui/model/impl/VoiceControlStateProvider.h b/call-ui/model/impl/VoiceControlStateProvider.h deleted file mode 100644 index bec63d5..0000000 --- a/call-ui/model/impl/VoiceControlStateProvider.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2017 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://floralicense.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __CALL_UI_MODEL_IMPL_VOICE_CONTROL_STATE_PROVIDER_H__ -#define __CALL_UI_MODEL_IMPL_VOICE_CONTROL_STATE_PROVIDER_H__ - -#include - -#include "types.h" - -namespace callui { - - UCL_DECLARE_REF_ALIASES(VoiceControlStateProvider); - - /** - * @brief Voice control state provider. - * Provides state whether enable/disable voice control - */ - class VoiceControlStateProvider final { - public: - - /** - * @brief Creates new instance of VoiceControlStateProvider - * @return Shared reference to VoiceControlStateProvider - * instance on success or NULL otherwise - */ - static VoiceControlStateProviderSRef newInstance(); - - /** - * Gets state - * @return true if aVoice control is enable, false otherwise - */ - bool getState() const; - - /** - * Adds state change handler - * @param[in] handler Handler to add - */ - void addStateChangeHandler(const NotiHandler &handler); - - /** - * Removes state change handler - * @param[in] handler Handler to remove - */ - void removeStateChangeHandler(const NotiHandler &handler); - - private: - VoiceControlStateProvider(); - ~VoiceControlStateProvider(); - - ucl::Result prepare(); - - ucl::Result addSysStateCallback(); - void delSysStateCallback(); - ucl::Result initState(); - bool updateState(bool isEnable); - - void onStateChanged(keynode_t *node); - - private: - bool m_enableState; - ucl::Event m_event; - - friend class ucl::ReffedObj; - }; - -} - -#endif // __CALL_UI_MODEL_IMPL_VOICE_CONTROL_STATE_PROVIDER_H__ diff --git a/call-ui/model/impl/VoiceControlStateSource.cpp b/call-ui/model/impl/VoiceControlStateSource.cpp deleted file mode 100644 index 51d7719..0000000 --- a/call-ui/model/impl/VoiceControlStateSource.cpp +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright 2017 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://floralicense.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "VoiceControlStateSource.h" - -#include "common.h" - -namespace callui { - - using namespace ucl; - - VoiceControlStateSource::Bits::Bits(): - property(convertEnumValueToInt(IndicatorProperty::VOICE_CONTROL)), - isEnable(0) - { - } - - VoiceControlStateSource::Bits::Bits(const IndicatorState &state): - value(state.value) - { - if (property != convertEnumValueToInt( - IndicatorProperty::VOICE_CONTROL)) { - ELOG("State of incorrect property type [%d]", property); - *this = {}; - } - } - - VoiceControlStateSource::VoiceControlStateSource(IRefCountObj &rc, - const VoiceControlStateProviderSRef &provider): - RefCountAware(&rc), - m_vcProvider(provider) - { - m_vcProvider->addStateChangeHandler(WEAK_DELEGATE( - VoiceControlStateSource::onStateChangedEvent, - asWeak(*this))); - - updateStateBits(m_vcProvider->getState()); - } - - VoiceControlStateSource::~VoiceControlStateSource() - { - m_vcProvider->removeStateChangeHandler(WEAK_DELEGATE( - VoiceControlStateSource::onStateChangedEvent, - asWeak(*this))); - } - - VoiceControlStateSourceSRef VoiceControlStateSource::newInstance( - const VoiceControlStateProviderSRef &provider) - { - if (!provider) { - LOG_RETURN_VALUE(RES_FAIL, {}, "provider is NULL"); - } - - return makeShared(provider); - } - - void VoiceControlStateSource::onStateChangedEvent() - { - if (updateStateBits(m_vcProvider->getState()) && m_handler) { - m_handler(); - } - } - - Result VoiceControlStateSource::initState() - { - updateStateBits(m_vcProvider->getState()); - return RES_OK; - } - - IndicatorState VoiceControlStateSource::getState() const - { - return {m_bits.value}; - } - - void VoiceControlStateSource::setStateChangeHandler( - const NotiHandler &handler) - { - m_handler = handler; - } - - bool VoiceControlStateSource::updateStateBits(bool isEnable) - { - if (m_bits.isEnable != isEnable) { - m_bits.isEnable = isEnable; - return true; - } - return false; - } - - bool getVoiceControlState(IndicatorState state) - { - return VoiceControlStateSource::Bits(state).isEnable; - } - -} diff --git a/call-ui/model/impl/VoiceControlStateSource.h b/call-ui/model/impl/VoiceControlStateSource.h deleted file mode 100644 index 85b04d6..0000000 --- a/call-ui/model/impl/VoiceControlStateSource.h +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright 2017 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://floralicense.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __CALL_UI_VOICE_CONTROL_STATE_SOURCE_H__ -#define __CALL_UI_VOICE_CONTROL_STATE_SOURCE_H__ - -#include "IIndicatorStateSource.h" - -#include "VoiceControlStateProvider.h" - -#include "types.h" - -namespace callui { - - UCL_DECLARE_REF_ALIASES(VoiceControlStateSource); - - /** - * @brief Represents Voice control state source for IndicatorStateProvider - * Inherits from IIndicatorStateSource - * @see IIndicatorStateSource - */ - class VoiceControlStateSource final : - public IIndicatorStateSource, - public ucl::RefCountAware { - public: - - /** - * @brief Creates new instance of VoiceControlStateSource - * @param[in] provider Voice control state provider - * @return Shared reference to VoiceControlStateSource - * instance on success or NULL otherwise - */ - static VoiceControlStateSourceSRef newInstance( - const VoiceControlStateProviderSRef &provider); - - // IIndicatorStateSource // - - /** - * IIndicatorStateSource::getState() - */ - virtual IndicatorState getState() const override final; - - /** - * IIndicatorStateSource::setStateChangeHandler() - */ - virtual void setStateChangeHandler( - const NotiHandler &handler) override final; - - private: - VoiceControlStateSource(ucl::IRefCountObj &rc, - const VoiceControlStateProviderSRef &provider); - ~VoiceControlStateSource(); - - ucl::Result prepare(); - - void onStateChangedEvent(); - ucl::Result initState(); - bool updateStateBits(bool isEnable); - - public: - union Bits { - struct { - uint8_t property : 4; - uint8_t isEnable : 1; - }; - uint64_t value; - - Bits(); - Bits(const IndicatorState &state); - }; - - private: - Bits m_bits; - NotiHandler m_handler; - VoiceControlStateProviderSRef m_vcProvider; - - friend class ucl::ReffedObj; - }; - -} - -#endif // __CALL_UI_VOICE_ANSWER_STATE_SOURCE_H__ diff --git a/call-ui/model/types.h b/call-ui/model/types.h index 7d82b2c..13280f4 100644 --- a/call-ui/model/types.h +++ b/call-ui/model/types.h @@ -175,7 +175,6 @@ namespace callui { NW_CONNECTION = 0, /**< Network connection property */ RSSI, /**< RSSI property */ BATTERY, /**< Battery property */ - VOICE_CONTROL, /**< Voice control property */ SIM_SLOT, /**< Sim slot property */ HD_VOICE /**< Call HD voice property */ }; diff --git a/call-ui/presenters/misc/IndicatorPresenter.cpp b/call-ui/presenters/misc/IndicatorPresenter.cpp index 4097b52..f0601cc 100644 --- a/call-ui/presenters/misc/IndicatorPresenter.cpp +++ b/call-ui/presenters/misc/IndicatorPresenter.cpp @@ -43,13 +43,9 @@ namespace callui { namespace { namespace impl { constexpr LayoutTheme LAYOUT_HD_CALL {"layout", "callui", "hd_voice"}; - constexpr LayoutTheme LAYOUT_VOICE_CONTROL - {"layout", "callui", "voice_control"}; - constexpr EdjePart PART_SWL_CONN {"swl.connection"}; constexpr EdjePart PART_SWL_RSSI {"swl.rssi"}; constexpr EdjePart PART_SWL_BATTERY {"swl.battery"}; - constexpr EdjePart PART_SWL_VOICE_CONTROL {"swl.voice_control"}; constexpr EdjePart PART_SWL_SIM {"swl.sim"}; constexpr EdjePart PART_SWL_HD_VOICE {"swl.hd_voice"}; @@ -196,13 +192,8 @@ namespace callui { IndicatorPresenter::IndicatorPresenter(IRefCountObj &rc, const IIndicatorStateProviderSRef &provider): - GuiPresenter(rc), - m_provider(provider), - m_isIncomingCallMode(false) - { - } - - IndicatorPresenter::~IndicatorPresenter() + GuiPresenter(rc), + m_provider(provider) { } @@ -219,15 +210,11 @@ namespace callui { "createRssiLayout() failed!"); FAIL_RETURN(createBatteryLayout(), "createBatteryLayout() failed!"); - FAIL_RETURN(createVoiceControlLayout(), - "createBatteryLayout() failed!"); FAIL_RETURN(createSimLayout(), "createSimLayout() failed!"); FAIL_RETURN(createHdVoiceLayout(), "createHdCallLayout() failed!"); - updateCentralIcon(); - m_provider->setListener(asWeak(*this)); return RES_OK; @@ -293,21 +280,6 @@ namespace callui { return RES_OK; } - Result IndicatorPresenter::createVoiceControlLayout() - { - m_voiceControlLayout = Layout::Builder(). - setTheme(impl::LAYOUT_VOICE_CONTROL). - setIsOwner(false). - build(*m_widget); - if (!m_voiceControlLayout) { - LOG_RETURN(RES_FAIL, "Layout::build() failed!"); - } - - m_widget->setContent(*m_voiceControlLayout, impl::PART_SWL_VOICE_CONTROL); - - return RES_OK; - } - Result IndicatorPresenter::createSimLayout() { m_simLayout = Layout::Builder(). @@ -395,39 +367,6 @@ namespace callui { return *m_widget; } - void IndicatorPresenter::setIncomingCallMode(bool isIncomingCallMode) - { - if (m_isIncomingCallMode == isIncomingCallMode) { - return; - } - m_isIncomingCallMode = isIncomingCallMode; - updateCentralIcon(); - } - - void IndicatorPresenter::updateCentralIcon() - { - if (m_isIncomingCallMode) { - auto state = m_provider->getState( - IndicatorProperty::VOICE_CONTROL); - - if (getVoiceControlState(state)) { - m_widget->setContent(*m_voiceControlLayout, - impl::PART_SWL_VOICE_CONTROL); - show(*m_voiceControlLayout); - - m_widget->unsetContent(impl::PART_SWL_BATTERY); - hide(*m_batteryLayout); - return; - } - } - m_widget->unsetContent(impl::PART_SWL_VOICE_CONTROL); - hide(*m_voiceControlLayout); - - m_widget->setContent(*m_batteryLayout, - impl::PART_SWL_BATTERY); - show(*m_batteryLayout); - } - void IndicatorPresenter::onStateChanged(IndicatorProperty property) { switch (property) { @@ -440,9 +379,6 @@ namespace callui { case IndicatorProperty::BATTERY: updateBatteryState(); break; - case IndicatorProperty::VOICE_CONTROL: - updateCentralIcon(); - break; case IndicatorProperty::SIM_SLOT: updateSimState(); break; diff --git a/call-ui/presenters/misc/IndicatorPresenter.h b/call-ui/presenters/misc/IndicatorPresenter.h index f18640e..b1d969e 100644 --- a/call-ui/presenters/misc/IndicatorPresenter.h +++ b/call-ui/presenters/misc/IndicatorPresenter.h @@ -83,18 +83,10 @@ namespace callui { */ ucl::Widget &getWidget(); - /** - * @brief Sets incoming call mode - * @remark Used for display Voice Answer icon on incoming - * call if feature is turned on - * @param[in] isIncomingCallMode incoming call mode - */ - void setIncomingCallMode(bool isIncomingCallMode); - private: IndicatorPresenter(ucl::IRefCountObj &rc, const IIndicatorStateProviderSRef &provider); - ~IndicatorPresenter(); + ~IndicatorPresenter() = default; ucl::Result prepare(ucl::GuiPresenter &parent, ucl::ElmWidget &parentWidget); @@ -103,7 +95,6 @@ namespace callui { ucl::Result createConnectionLayout(); ucl::Result createRssiLayout(); ucl::Result createBatteryLayout(); - ucl::Result createVoiceControlLayout(); ucl::Result createSimLayout(); ucl::Result createHdVoiceLayout(); @@ -113,8 +104,6 @@ namespace callui { void updateSimState(); void updateHdVoiceState(); - void updateCentralIcon(); - // IIndicatorStateListener // virtual void onStateChanged(IndicatorProperty property) override final; @@ -126,9 +115,8 @@ namespace callui { ucl::LayoutSRef m_batteryLayout; ucl::LayoutSRef m_simLayout; ucl::LayoutSRef m_hdCallLayout; - ucl::LayoutSRef m_voiceControlLayout; + IIndicatorStateProviderSRef m_provider; - bool m_isIncomingCallMode; friend class ucl::ReffedObj; }; diff --git a/call-ui/presenters/pages/KeypadPage.cpp b/call-ui/presenters/pages/KeypadPage.cpp index 4033be3..4ac2fd9 100644 --- a/call-ui/presenters/pages/KeypadPage.cpp +++ b/call-ui/presenters/pages/KeypadPage.cpp @@ -657,7 +657,9 @@ namespace callui { return *vcVolumeValueAo; } } else if (ao == getWindow()) { - return *firstBtn; + if (firstBtn) { + return *firstBtn; + } } else { LOG_RETURN_VALUE(RES_FAIL, nullptr, "Unknown object!"); } diff --git a/call-ui/presenters/pages/MainPage.cpp b/call-ui/presenters/pages/MainPage.cpp index aedabba..1caaa78 100644 --- a/call-ui/presenters/pages/MainPage.cpp +++ b/call-ui/presenters/pages/MainPage.cpp @@ -230,10 +230,6 @@ namespace callui { } } - if (m_indicator) { - m_indicator->setIncomingCallMode(true); - } - return RES_OK; } @@ -254,10 +250,6 @@ namespace callui { Result MainPage::processEndCallMode() { - if (m_indicator) { - m_indicator->setIncomingCallMode(false); - } - FAIL_RETURN(createAccessoryPresenter(), "createAccessoryPresenter() failed"); @@ -288,10 +280,6 @@ namespace callui { m_rmLy.reset(); m_rmCueAo.reset(); - if (m_indicator) { - m_indicator->setIncomingCallMode(false); - } - FAIL_RETURN(createAccessoryPresenter(), "createAccessoryPresenter() failed"); FAIL_RETURN(createMoreOptionsPresenter(), diff --git a/edc/images/Indicator_icon/indi_voice_control.png b/edc/images/Indicator_icon/indi_voice_control.png deleted file mode 100644 index f4631d0..0000000 Binary files a/edc/images/Indicator_icon/indi_voice_control.png and /dev/null differ diff --git a/edc/indicator.edc b/edc/indicator.edc index f47ce4b..30f8261 100644 --- a/edc/indicator.edc +++ b/edc/indicator.edc @@ -92,13 +92,6 @@ group { "elm/layout/callui/indicator"; rel2 { relative: CU_SWL_BATTERY_REL2; to: "bg"; } } } - swallow { "swl.voice_control"; - scale; - desc { "default"; - rel1 { relative: CU_SWL_VC_REL1; to: "bg"; } - rel2 { relative: CU_SWL_VC_REL2; to: "bg"; } - } - } swallow { "swl.sim"; scale; desc { "default"; @@ -524,26 +517,6 @@ group { "elm/layout/callui/battery"; } } -// Voice Control - -group { "elm/layout/callui/voice_control"; - images { - image: CU_INDI_ICONS_DIR"/indi_voice_control.png" COMP; - } - parts { - image { "img.voice_control"; - scale; - desc { "default"; - fixed: 1 1; - min: CU_INDI_CENTRAL_ICON_W CU_INDI_CENTRAL_ICON_H; - max: CU_INDI_CENTRAL_ICON_W CU_INDI_CENTRAL_ICON_H; - image.normal: CU_INDI_ICONS_DIR"/indi_voice_control.png"; - color_class: "AO0111"; - } - } - } -} - // SIM group { "elm/layout/callui/sim"; diff --git a/project_def.prop b/project_def.prop index 0d0f976..501dfc9 100644 --- a/project_def.prop +++ b/project_def.prop @@ -9,7 +9,7 @@ type = app profile = wearable-4.0 # C/CPP Sources -USER_SRCS = call-ui/view/VolumeControl.cpp call-ui/model/impl/CallInfo.cpp call-ui/presenters/base/Page.cpp call-ui/model/impl/IncomingCall.cpp ucl/source/appfw/helpers.cpp ucl/source/mvp/ListItemPresenter.cpp call-ui/model/impl/RejectMsg.cpp ucl/source/gui/Genlist.cpp ucl/source/util/types/Result.cpp call-ui/model/impl/ConferenceCallInfo.cpp call-ui/model/impl/BluetoothManager.cpp ucl/source/gui/Layout.cpp call-ui/presenters/misc/MotionSensorPresenter.cpp call-ui/model/impl/RssiStateSource.cpp call-ui/presenters/Instance.cpp call-ui/model/impl/ActiveCall.cpp call-ui/model/impl/SimSlotStateSource.cpp call-ui/presenters/misc/AcceptRejectPresenter.cpp ucl/source/gui/WidgetItem.cpp call-ui/presenters/pages/MainPage.cpp ucl/source/gui/NaviItem.cpp call-ui/presenters/misc/DeviceStatePresenter.cpp call-ui/model/impl/ContactInfoProvider.cpp call-ui/model/impl/HdVoiceStateSource.cpp call-ui/model/impl/VoiceControlStateProvider.cpp ucl/source/gui/Window.cpp call-ui/model/impl/ConnectionStateSource.cpp call-ui/presenters/misc/RejectMsgPresenter.cpp call-ui/presenters/pages/KeypadPage.cpp ucl/source/util/logging.cpp ucl/source/appfw/UIApp.cpp call-ui/presenters/misc/AccessoryPresenter.cpp call-ui/model/impl/ContactInfo.cpp call-ui/model/impl/EndCall.cpp call-ui/view/Slider.cpp call-ui/model/impl/RejectMsgProvider.cpp ucl/source/mvp/GuiPresenter.cpp ucl/source/appfw/InstanceManagerBase.cpp call-ui/model/impl/BatteryStateSource.cpp ucl/source/gui/Widget.cpp call-ui/presenters/dialogs/AcceptDialog.cpp call-ui/types.cpp call-ui/presenters/misc/helpers.cpp call-ui/model/impl/IndicatorStateProvider.cpp call-ui/view/AcceptRejectWidget.cpp ucl/source/misc/Timeout.cpp call-ui/resources.cpp call-ui/model/CallUIBuilder.cpp call-ui/presenters/misc/CallStatusPresenter.cpp call-ui/model/impl/HeldCall.cpp call-ui/model/impl/SoundManager.cpp ucl/source/gui/EdjeWidget.cpp call-ui/model/impl/MsgClient.cpp call-ui/presenters/InstanceManager.cpp call-ui/presenters/misc/MoreOptionsPresenter.cpp call-ui/presenters/misc/IndicatorPresenter.cpp call-ui/presenters/misc/AtspiHighlightHelper.cpp ucl/source/gui/Naviframe.cpp call-ui/model/impl/CallUI.cpp ucl/source/gui/ElmWidget.cpp ucl/source/misc/Variant.cpp call-ui/view/helpers.cpp call-ui/main.cpp call-ui/model/impl/CallManager.cpp call-ui/presenters/misc/CallInfoPresenter.cpp ucl/source/appfw/SysEventProvider.cpp call-ui/model/impl/CallClient.cpp call-ui/model/impl/VoiceControlStateSource.cpp ucl/source/mvp/ListPresenter.cpp +USER_SRCS = call-ui/view/VolumeControl.cpp call-ui/model/impl/CallInfo.cpp call-ui/presenters/base/Page.cpp call-ui/model/impl/IncomingCall.cpp ucl/source/appfw/helpers.cpp ucl/source/mvp/ListItemPresenter.cpp call-ui/model/impl/RejectMsg.cpp ucl/source/gui/Genlist.cpp ucl/source/util/types/Result.cpp call-ui/model/impl/ConferenceCallInfo.cpp call-ui/model/impl/BluetoothManager.cpp ucl/source/gui/Layout.cpp call-ui/presenters/misc/MotionSensorPresenter.cpp call-ui/model/impl/RssiStateSource.cpp call-ui/presenters/Instance.cpp call-ui/model/impl/ActiveCall.cpp call-ui/model/impl/SimSlotStateSource.cpp call-ui/presenters/misc/AcceptRejectPresenter.cpp ucl/source/gui/WidgetItem.cpp call-ui/presenters/pages/MainPage.cpp ucl/source/gui/NaviItem.cpp call-ui/presenters/misc/DeviceStatePresenter.cpp call-ui/model/impl/ContactInfoProvider.cpp call-ui/model/impl/HdVoiceStateSource.cpp ucl/source/gui/Window.cpp call-ui/model/impl/ConnectionStateSource.cpp call-ui/presenters/misc/RejectMsgPresenter.cpp call-ui/presenters/pages/KeypadPage.cpp ucl/source/util/logging.cpp ucl/source/appfw/UIApp.cpp call-ui/presenters/misc/AccessoryPresenter.cpp call-ui/model/impl/ContactInfo.cpp call-ui/model/impl/EndCall.cpp call-ui/view/Slider.cpp call-ui/model/impl/RejectMsgProvider.cpp ucl/source/mvp/GuiPresenter.cpp ucl/source/appfw/InstanceManagerBase.cpp call-ui/model/impl/BatteryStateSource.cpp ucl/source/gui/Widget.cpp call-ui/presenters/dialogs/AcceptDialog.cpp call-ui/types.cpp call-ui/presenters/misc/helpers.cpp call-ui/model/impl/IndicatorStateProvider.cpp call-ui/view/AcceptRejectWidget.cpp ucl/source/misc/Timeout.cpp call-ui/resources.cpp ucl/source/util/types/classTypes.cpp call-ui/model/CallUIBuilder.cpp call-ui/presenters/misc/CallStatusPresenter.cpp call-ui/model/impl/HeldCall.cpp call-ui/model/impl/SoundManager.cpp ucl/source/gui/EdjeWidget.cpp call-ui/model/impl/MsgClient.cpp call-ui/presenters/InstanceManager.cpp call-ui/presenters/misc/MoreOptionsPresenter.cpp call-ui/presenters/misc/IndicatorPresenter.cpp call-ui/presenters/misc/AtspiHighlightHelper.cpp ucl/source/gui/Naviframe.cpp call-ui/model/impl/CallUI.cpp ucl/source/gui/ElmWidget.cpp ucl/source/gui/RadioBox.cpp ucl/source/misc/Variant.cpp call-ui/view/helpers.cpp call-ui/main.cpp call-ui/model/impl/CallManager.cpp call-ui/presenters/misc/CallInfoPresenter.cpp ucl/source/appfw/SysEventProvider.cpp call-ui/model/impl/CallClient.cpp ucl/source/mvp/ListPresenter.cpp # EDC Sources USER_EDCS =