TizenRefApp-8785 [Call UI] Fix issue with hidding VolumControl by back button in...

Change-Id: Ic32faf6bee6eefdf8d1bdd64e61bfbbbb33af845

diff --git a/inc/presenters/KeypadPage.h b/inc/presenters/KeypadPage.h
index 9d20a9c73401d17fd3e231a2177f649e90e96e6e..027ce6453535e6363f12d6dc1ce6c11adad01e95 100644 (file)
--- 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 cf5c2ad6010be6930ac7de9716f0141964c0f44a..5bc6b64cb048dc689f30db887dc6ada9f586fb7d 100644 (file)
--- 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()) {