Fix for N_SE-44669 and similar issues

Change-Id: Ic0cee923773e609dea94de3b2c59afda1f24324c
Signed-off-by: Saravana Balaji <saravana.bs@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp
index b728ed2..78af994 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewItem.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp
@@ -1411,8 +1411,13 @@ _TableViewItem::FireItemTouchReleased()
                        else if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING ||
                                __annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER)
                        {
+                               bool isPreviousChecked = IsChecked();
                                AdjustAnnexOnOffHandlerPosition();
                                selectedItem = false;
+                               if (isPreviousChecked == IsChecked())
+                               {
+                                       fireItemEvent = false;
+                               }
                        }
                        else
                        {
@@ -1449,8 +1454,13 @@ _TableViewItem::FireItemTouchReleased()
                        if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING ||
                                __annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER)
                        {
+                               bool isPreviousChecked = IsChecked();
                                AdjustAnnexOnOffHandlerPosition();
                                fireItemEvent = true;
+                               if (isPreviousChecked == IsChecked())
+                               {
+                                       fireItemEvent = false;
+                               }
                        }
                }
        }
@@ -1493,6 +1503,7 @@ _TableViewItem::OnTouchMoved(const _Control& source, const _TouchInfo& touchinfo
                if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_DETAILED)
                {
                        __isSelectedDetailButton = false;
+                       __itemSelected = false;
                        DrawAnnexStyle();
                }
                else if(__annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING ||