Fixed JIRA issues N_SE-44533 & N_SE-44577

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

diff --git a/src/ui/controls/FUiCtrl_DateTimeBar.cpp b/src/ui/controls/FUiCtrl_DateTimeBar.cpp
index 912a6e6..bfdbca9 100644 (file)
--- a/src/ui/controls/FUiCtrl_DateTimeBar.cpp
+++ b/src/ui/controls/FUiCtrl_DateTimeBar.cpp
@@ -60,6 +60,11 @@ _DateTimeBar::~_DateTimeBar(void)
 {
        ReleaseTouchCapture();
 
+       if (GetVisualElement())
+       {
+               GetVisualElement()->RemoveAllAnimations();
+       }
+
        if (__pDateTimeChangeEvent != null)
        {
                delete __pDateTimeChangeEvent;

diff --git a/src/ui/controls/FUiCtrl_EditDate.cpp b/src/ui/controls/FUiCtrl_EditDate.cpp
index eba32b2..5089141 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditDate.cpp
+++ b/src/ui/controls/FUiCtrl_EditDate.cpp
@@ -1155,7 +1155,7 @@ _EditDate::OnAncestorVisibleStateChanged(const _Control& control)
 {
        if (GetDateTimeBar() != null && GetDateTimeBar()->IsActivated())
        {
-               GetDateTimeBar()->CloseDateTimeBar();
+               GetDateTimeBar()->Close();
                __pEditDatePresenter->SetLastSelectedId(DATETIME_ID_NONE);
                Invalidate();
        }
@@ -1168,7 +1168,7 @@ _EditDate::OnAncestorEnableStateChanged(const _Control& control)
        {
                if (GetDateTimeBar() != null && GetDateTimeBar()->IsActivated())
                {
-                       GetDateTimeBar()->CloseDateTimeBar();
+                       GetDateTimeBar()->Close();
                        __pEditDatePresenter->SetLastSelectedId(DATETIME_ID_NONE);
                        Invalidate();
                }

diff --git a/src/ui/controls/FUiCtrl_EditTime.cpp b/src/ui/controls/FUiCtrl_EditTime.cpp
index 840e8c9..3b65d5d 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditTime.cpp
+++ b/src/ui/controls/FUiCtrl_EditTime.cpp
@@ -876,8 +876,7 @@ _EditTime::OnAncestorVisibleStateChanged(const _Control& control)
 {
        if(GetDateTimeBar() != null && GetDateTimeBar()->IsActivated())
        {
-
-               GetDateTimeBar()->CloseDateTimeBar();
+               GetDateTimeBar()->Close();
                __pEditTimePresenter->SetLastSelectedId(DATETIME_ID_NONE);
                Invalidate();
        }
@@ -891,8 +890,7 @@ _EditTime::OnAncestorEnableStateChanged(const _Control& control)
        {
                if(GetDateTimeBar() != null && GetDateTimeBar()->IsActivated())
                {
-
-                       GetDateTimeBar()->CloseDateTimeBar();
+                       GetDateTimeBar()->Close();
                        __pEditTimePresenter->SetLastSelectedId(DATETIME_ID_NONE);
                        Invalidate();
                }