Fix for focus Issues in EditDate/EditTime

Signed-off-by: Bhavya Kumili <bhavya.k@samsung.com>
Change-Id: Ie7635b7dcbce2e602c621737812108ee26a264df

diff --git a/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp b/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp
index 940ec7d..2b2bda9 100644 (file)
--- a/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp
@@ -165,7 +165,6 @@ _DateTimeBarPresenter::LoadArrowBitmap(void)
 {
        result r = E_SUCCESS;
        Color arrowColor;
-       Bitmap* pArrowNormalBitmap = null;
 
        GET_COLOR_CONFIG(DATETIMEBAR::BG_NORMAL, arrowColor);
 
@@ -1204,6 +1203,7 @@ _DateTimeBarPresenter::OnTouchPressed(const _Control& source, const _TouchInfo&
        {
                ResetFlickAnimationTimer();
                __isFlickCanceled = true;
+               __isInitialAnimation = false;
        }
 
        __touchMoveHandled = false;

diff --git a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
index 580bfc6..eb9b087 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
@@ -955,6 +955,7 @@ void
 _EditDatePresenter::OnFocusModeStateChanged(void)
 {
        __isFocused = false;
+       __isEnterKeyPressed = false;
        __focusId = DATETIME_ID_NONE;
        __pEditDate->Invalidate();
        return;

diff --git a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
index d8ae649..8892eb0 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
@@ -1131,6 +1131,7 @@ _EditTimePresenter::OnFocusModeStateChanged(void)
 {
        __isFocused = false;
        __focusId = DATETIME_ID_NONE;
+       __isEnterKeyPressed = false;
        __pEditTime->Invalidate();
        return;
 }