From 66deef34335c9936c7f40168d37571102202f381 Mon Sep 17 00:00:00 2001 From: Igor Kuksiuk Date: Mon, 3 Jul 2017 16:03:12 +0300 Subject: [PATCH] TizenRefApp-8785 [Call UI] Fix issue with hidding VolumControl by back button in Keypad Page Change-Id: Ic32faf6bee6eefdf8d1bdd64e61bfbbbb33af845 --- inc/presenters/KeypadPage.h | 8 ++++---- src/presenters/KeypadPage.cpp | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/inc/presenters/KeypadPage.h b/inc/presenters/KeypadPage.h index 9d20a9c..027ce64 100644 --- a/inc/presenters/KeypadPage.h +++ b/inc/presenters/KeypadPage.h @@ -61,9 +61,7 @@ namespace callui { ucl::Result createButtons(); ucl::Result createVolumeControl(); - //sound manager-> play dtmf for digit void startDtmf(const unsigned char digit); - //sound manager-> stop dtmf if still playing void stopDtmf(); void onAudioStateChanged(AudioStateType state); @@ -81,15 +79,17 @@ namespace callui { void registerCallbacks(); void unregisterCallbacks(); + // Page + + virtual void onBackKey() override final; + private: ucl::LayoutSRef m_widget; ucl::ElmWidgetSRef m_entry; - //sound manager usage ISoundManagerSRef m_sm; bool m_smInUse; - //volume control usage VolumeControlSRef m_vc; Ecore_Timer *m_vcTimer; diff --git a/src/presenters/KeypadPage.cpp b/src/presenters/KeypadPage.cpp index cf5c2ad..5bc6b64 100644 --- a/src/presenters/KeypadPage.cpp +++ b/src/presenters/KeypadPage.cpp @@ -329,6 +329,16 @@ namespace callui { return RES_OK; } + void KeypadPage::onBackKey() + { + if (m_vcTimer) { + stopVCTimer(); + hide(*m_vc); + } else { + requestExit(); + } + } + void KeypadPage::onVolumeControlEventCb(VolumeControlEvent event) { if (!isActive()) { -- 2.34.1