Adding exit method in edit mode.

Change-Id: Ie7b68b91c9f1de51aca4c55fca3ca05ebdbec63f
Signed-off-by: shivamv <shivam.v2@samsung.com>

diff --git a/TrayApplication/Views/ApplicationsView.cs b/TrayApplication/Views/ApplicationsView.cs
index a427d418143798087575e2b1bdaa7d2a2e48a029..29fc9d1006aa357cc6ba7513290604fa071a99aa 100755 (executable)
--- a/TrayApplication/Views/ApplicationsView.cs
+++ b/TrayApplication/Views/ApplicationsView.cs
@@ -104,6 +104,11 @@ namespace TrayApplication.Views
                 appIcons[^1].Opacity = 1.0f;
             }
             this.removeMode = removeMode;
+        }\r
+\r
+        public void InvokeRemoveModeEvent()\r
+        {\r
+            RemoveModeToggled.Invoke(this, new EventArgs());\r
         }
 
         private IEnumerable appList;

diff --git a/TrayApplication/Views/MainView.cs b/TrayApplication/Views/MainView.cs
index 215f42448b2999bfa6d9ae09b50c6ebc8cb959d4..3fdaefae5899785a7dc1a69414a8028896542861 100755 (executable)
--- a/TrayApplication/Views/MainView.cs
+++ b/TrayApplication/Views/MainView.cs
@@ -73,8 +73,30 @@ namespace TrayApplication.Views
         private void ApplicationsViewRemoveModeToggled(object sender, EventArgs e)
         {
             removeMode = !removeMode;
+            UpdateTouchEvent();
             applicationsView.OnRemoveModeToggled(removeMode);
             quickAccessView.OnRemoveModeToggled(removeMode);
+        }\r
+\r
+        private void UpdateTouchEvent()\r
+        {\r
+            if (removeMode == true)\r
+            {\r
+                TouchEvent += MainViewTouched;\r
+            }\r
+            else\r
+            {\r
+                TouchEvent -= MainViewTouched;\r
+            }\r
+        }
+
+        private bool MainViewTouched(object source, TouchEventArgs e)\r
+        {\r
+            if (e.Touch.GetState(0) == PointStateType.Up)\r
+            {\r
+                applicationsView.InvokeRemoveModeEvent();\r
+            }\r
+            return true;\r
         }
 
         private void OnThemeUpdated(object sender, ThemeChangedEventArgs e)
@@ -189,6 +211,10 @@ namespace TrayApplication.Views
 
         public void HideView()
         {
+            if (removeMode == true)
+            {
+                applicationsView.InvokeRemoveModeEvent();
+            }
             HideAnimation();
         }
     }

diff --git a/TrayApplication/Views/QuickAccessView.cs b/TrayApplication/Views/QuickAccessView.cs
old mode 100644 (file)
new mode 100755 (executable)
index d3eebc5..896995a
--- a/TrayApplication/Views/QuickAccessView.cs
+++ b/TrayApplication/Views/QuickAccessView.cs
@@ -100,7 +100,6 @@ namespace TrayApplication.Views
             }
             defaultButtons.Clear();
 
-            int i = 0;
             foreach (var item in appList)
             {
                 Button button = CreateNewButton();

diff --git a/packaging/org.tizen.TrayApplication-1.0.0.tpk b/packaging/org.tizen.TrayApplication-1.0.0.tpk
index d7f5b3cf3462ea41613dc45b249082dce9b33a8b..5fba59d1472ae306f3d8195c1473a367f5d1b7cc 100755 (executable)
Binary files a/packaging/org.tizen.TrayApplication-1.0.0.tpk and b/packaging/org.tizen.TrayApplication-1.0.0.tpk differ