From: Igor Olshevskyi <i.olshevskyi@samsung.com>
Date: Fri, 11 Aug 2017 14:01:58 +0000 (+0300)
Subject: Merge branch 'tizen_dev' into tizen
X-Git-Tag: submit/tizen/20170811.141832^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9783350f42e3ae47e0c9fa619500bdfee4efb4d6;p=profile%2Fwearable%2Fapps%2Fnative%2Fcall-ui.git

Merge branch 'tizen_dev' into tizen

Change-Id: I836d143736ef9a4f1075cce86804aa8215b2a215
---

9783350f42e3ae47e0c9fa619500bdfee4efb4d6
diff --cc project_def.prop
index 319d051,319d051..1fe3c17
--- a/project_def.prop
+++ b/project_def.prop
@@@ -9,7 -9,7 +9,7 @@@ type = ap
  profile = wearable-4.0
  
  # C/CPP Sources
--USER_SRCS = ucl/src/gui/Naviframe.cpp ucl/src/gui/WidgetItem.cpp src/presenters/InstanceManager.cpp ucl/src/appfw/UIApp.cpp src/presenters/AcceptDialog.cpp ucl/src/gui/NaviItem.cpp src/model/CallManager.cpp ucl/src/gui/Layout.cpp src/model/IncomingCall.cpp src/presenters/Page.cpp ucl/src/misc/Timeout.cpp src/resources.cpp src/presenters/DeviceStatePresenter.cpp src/model/ContactInfoProvider.cpp src/model/CallBuilder.cpp src/presenters/Instance.cpp ucl/src/gui/Window.cpp ucl/src/gui/Widget.cpp src/model/ActiveCall.cpp src/model/RejectMsgProvider.cpp src/model/Call.cpp src/presenters/MoreOptionsPresenter.cpp ucl/src/appfw/SysEventProvider.cpp src/types.cpp src/presenters/RejectMsgPresenter.cpp src/presenters/CallInfoPresenter.cpp src/model/BatteryStateSource.cpp src/model/ConnectionStateSource.cpp src/presenters/Presenter.cpp src/presenters/AccessoryPresenter.cpp src/model/CallClient.cpp src/model/ContactInfo.cpp src/model/EndCall.cpp src/presenters/MainPage.cpp src/model/RssiStateSource.cpp src/view/helpers.cpp src/model/HdVoiceStateSource.cpp ucl/src/util/logging.cpp ucl/src/util/types/Result.cpp ucl/src/misc/Variant.cpp src/model/BluetoothVolume.cpp src/model/IndicatorStateProvider.cpp src/presenters/KeypadPage.cpp src/presenters/helpers.cpp src/main.cpp src/view/VolumeControl.cpp src/model/MsgClient.cpp src/view/Slider.cpp src/model/CallInfo.cpp src/presenters/IndicatorPresenter.cpp ucl/src/appfw/helpers.cpp ucl/src/gui/ElmWidget.cpp src/model/SimSlotStateSource.cpp src/presenters/AcceptRejectPresenter.cpp ucl/src/gui/EdjeWidget.cpp src/presenters/CallStatusPresenter.cpp src/model/ConferenceCallInfo.cpp src/model/HeldCall.cpp src/model/SoundManager.cpp src/model/RejectMsg.cpp ucl/src/appfw/InstanceManagerBase.cpp 
++USER_SRCS = ucl/src/gui/WidgetItem.cpp src/presenters/InstanceManager.cpp ucl/src/appfw/UIApp.cpp src/model/VoiceControlStateProvider.cpp src/presenters/AcceptDialog.cpp ucl/src/gui/NaviItem.cpp ucl/src/gui/Layout.cpp src/model/IncomingCall.cpp src/presenters/Page.cpp src/resources.cpp src/presenters/DeviceStatePresenter.cpp src/model/ContactInfoProvider.cpp ucl/src/gui/Genlist.cpp ucl/src/gui/Window.cpp src/types.cpp src/presenters/RejectMsgPresenter.cpp src/model/ConnectionStateSource.cpp src/presenters/AccessoryPresenter.cpp src/model/ContactInfo.cpp src/model/EndCall.cpp src/presenters/MainPage.cpp src/view/helpers.cpp ucl/src/mvp/ListItemPresenter.cpp ucl/src/util/types/Result.cpp ucl/src/mvp/ListPresenter.cpp ucl/src/misc/Variant.cpp src/model/CallUI.cpp ucl/src/mvp/GuiPresenter.cpp src/view/VolumeControl.cpp src/view/Slider.cpp src/model/CallInfo.cpp ucl/src/gui/ElmWidget.cpp src/model/SimSlotStateSource.cpp src/presenters/AcceptRejectPresenter.cpp ucl/src/gui/EdjeWidget.cpp ucl/src/gui/Naviframe.cpp src/model/CallManager.cpp ucl/src/misc/Timeout.cpp src/presenters/Instance.cpp ucl/src/gui/Widget.cpp src/model/ActiveCall.cpp src/model/RejectMsgProvider.cpp src/presenters/MoreOptionsPresenter.cpp ucl/src/appfw/SysEventProvider.cpp src/presenters/CallInfoPresenter.cpp src/model/BatteryStateSource.cpp src/model/CallClient.cpp src/model/VoiceControlStateSource.cpp src/model/RssiStateSource.cpp src/model/HdVoiceStateSource.cpp ucl/src/util/logging.cpp src/model/IndicatorStateProvider.cpp src/presenters/KeypadPage.cpp src/presenters/helpers.cpp src/presenters/MotionSensorPresenter.cpp src/main.cpp src/model/MsgClient.cpp src/presenters/IndicatorPresenter.cpp ucl/src/appfw/helpers.cpp src/model/CallUIBuilder.cpp src/presenters/CallStatusPresenter.cpp src/model/ConferenceCallInfo.cpp src/model/HeldCall.cpp src/model/SoundManager.cpp src/model/BluetoothManager.cpp src/model/RejectMsg.cpp src/view/AcceptRejectWidget.cpp ucl/src/appfw/InstanceManagerBase.cpp 
  
  # EDC Sources
  USER_EDCS =