Fixed JIRA N_SE-44102 in EditDate & EditTime related to FocusUi

Signed-off-by: moinuddin.s <moinuddin.s@samsung.com>
Change-Id: Iaa8e873a111f3b2676c5a17586b6754f343c915e

diff --git a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
index 8a07e32..6a62b2c 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
@@ -1017,6 +1017,10 @@ _EditDatePresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo
                                {
                                        __focusId = DATETIME_ID_YEAR;
                                }
+                               else
+                               {
+                                       return false;
+                               }
                        }
                        else if (__focusId == DATETIME_ID_MONTH)
                        {
@@ -1028,6 +1032,10 @@ _EditDatePresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo
                                {
                                        __focusId = DATETIME_ID_DAY;
                                }
+                               else
+                               {
+                                       return false;
+                               }
                        }
                        else if (__focusId == DATETIME_ID_YEAR)
                        {
@@ -1039,6 +1047,10 @@ _EditDatePresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo
                                {
                                        __focusId = DATETIME_ID_DAY;
                                }
+                               else
+                               {
+                                       return false;
+                               }
                        }
                        __pEditDate->Invalidate();
                        break;
@@ -1056,6 +1068,10 @@ _EditDatePresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo
                                {
                                        __focusId = DATETIME_ID_MONTH;
                                }
+                               else
+                               {
+                                       return false;
+                               }
                        }
                        else if (__focusId == DATETIME_ID_MONTH)
                        {
@@ -1067,6 +1083,10 @@ _EditDatePresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo
                                {
                                        __focusId = DATETIME_ID_DAY;
                                }
+                               else
+                               {
+                                       return false;
+                               }
                        }
                        else if (__focusId == DATETIME_ID_YEAR)
                        {
@@ -1078,6 +1098,10 @@ _EditDatePresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo
                                {
                                        __focusId = DATETIME_ID_DAY;
                                }
+                               else
+                               {
+                                       return false;
+                               }
                        }
                        __pEditDate->Invalidate();
                        break;

diff --git a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
index c0b2c71..14f9398 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
@@ -1212,6 +1212,10 @@ _EditTimePresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo
                                        __focusId = DATETIME_ID_AMPM;
                                }
                        }
+                       else if (__focusId == DATETIME_ID_AMPM)
+                       {
+                               return false;
+                       }
 
                        __pEditTime->Invalidate();
                        break;
@@ -1228,6 +1232,10 @@ _EditTimePresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo
                        {
                                __focusId = DATETIME_ID_MINUTE;
                        }
+                       else if (__focusId == DATETIME_ID_HOUR)
+                       {
+                               return false;
+                       }
                        __pEditTime->Invalidate();
                        break;
                }