Modifying back button to simplify the structure

Change-Id: I6a0118776ac867c489c13325dbcb5899e19ea31d

diff --git a/TrayApplication/Common/InputGeneratorBase.cs b/TrayApplication/Common/InputGeneratorBase.cs
index 3c644da916f13a1ca21ff7c50246257f9c8ef03a..77e9e87e62971fe562528209e9eaa9e629246910 100644 (file)
--- a/TrayApplication/Common/InputGeneratorBase.cs
+++ b/TrayApplication/Common/InputGeneratorBase.cs
@@ -18,6 +18,7 @@ namespace TrayApplication.Common
 \r
         public static void OnKeyEvent()\r
         {\r
+            Tizen.Log.Debug(Resources.LogTag, "KeyEvent Called : " + KeyName);\r
             inputGenerator.GenerateKeyEvent(KeyName, 1);\r
             inputGenerator.GenerateKeyEvent(KeyName, 0);\r
         }\r

diff --git a/TrayApplication/Models/AppInfoModel.cs b/TrayApplication/Models/AppInfoModel.cs
index 6a80c9e38513bcc13266afd3a058387a37c64ebb..b16a8700618e925198afcace3ef800da6102f392 100644 (file)
--- a/TrayApplication/Models/AppInfoModel.cs
+++ b/TrayApplication/Models/AppInfoModel.cs
@@ -15,7 +15,12 @@ namespace TrayApplication.Models
             Name = name;
             ApplicationId = applicationId;
             IconUrl = url;
-            AppSelectCommand = new Command(OnAppSelect);
+            AppSelectCommand = new Command(OnAppSelect);\r
+\r
+            if (Name == "back")\r
+            {\r
+                InputGeneratorBase.InitInputGenerator();
+            }
         }\r
 \r
         public AppInfoModel(string name, string url)
@@ -50,8 +55,15 @@ namespace TrayApplication.Models
         }
 
         private void OnAppSelect(object selectedItem)
-        {
-            AppLauncher.LaunchApplication(ApplicationId);
+        {\r
+            if (Name == "back")\r
+            {\r
+                InputGeneratorBase.OnKeyEvent();\r
+            }
+            else\r
+            {\r
+                AppLauncher.LaunchApplication(ApplicationId);\r
+            }
         }
 
         private void SetDefaultBackground()

diff --git a/TrayApplication/ViewModels/QuickAccessViewModel.cs b/TrayApplication/ViewModels/QuickAccessViewModel.cs
index 140252bc50ce21aa92b06b13f55acc335f442d64..100ac0b521aca4688f27357a714dcbc7f05e872f 100644 (file)
--- a/TrayApplication/ViewModels/QuickAccessViewModel.cs
+++ b/TrayApplication/ViewModels/QuickAccessViewModel.cs
@@ -35,7 +35,7 @@ namespace TrayApplication.ViewModels
                 new AppInfoModel(AppNames[0], "org.tizen.homescreen-efl", imagePath + AppNames[0] + ".png"),
                 new AppInfoModel(AppNames[1], "org.tizen.setting", imagePath + AppNames[1] + ".png"),
                 new AppInfoModel(AppNames[2], "org.tizen.volume", imagePath + AppNames[2] + ".png"),
-                new AppInfoModel(AppNames[3], imagePath + AppNames[3] + ".png"),
+                new AppInfoModel(AppNames[3], string.Empty, imagePath + AppNames[3] + ".png"),
                 //new AppInfoModel(AppNames[3], "org.tizen.quickpanel", imagePath + AppNames[3] + ".png"), //Will be added Later
                 //new AppInfoModel(AppNames[5], "org.tizen.powerkey-syspopup", imagePath + AppNames[5] + ".png") //Will be added Later
             };

diff --git a/TrayApplication/Views/QuickAccessView.cs b/TrayApplication/Views/QuickAccessView.cs
index 3b53756c0c974d63448cce2a6ae67d1deb003e74..8065101ea7b3d9173f5bd7e404bb2970f4ab4180 100644 (file)
--- a/TrayApplication/Views/QuickAccessView.cs
+++ b/TrayApplication/Views/QuickAccessView.cs
@@ -10,8 +10,6 @@ namespace TrayApplication.Views
 {
     public class QuickAccessView : View
     {
-        private readonly List<string> AppNames = new List<string>() { "home", "settings", "volume", "back", "notifications", "gallery", "power" };
-
         private const int QuickAccessViewHeight = 124;
         private const int IconSize = 76;
         private List<Button> defaultButtons;
@@ -96,16 +94,6 @@ namespace TrayApplication.Views
                 button.Icon.SetBinding(ImageView.ResourceUrlProperty, "IconUrl");
                 button.SetBinding(Control.CommandProperty, "AppSelectCommand");\r
 \r
-                button.Name = AppNames[i++];\r
-                if (button.Name == "back")\r
-                {\r
-                    InputGeneratorBase.InitInputGenerator();\r
-                    button.Clicked += (object sender, ClickedEventArgs e) =>\r
-                    {\r
-                        Tizen.Log.Debug(Resources.LogTag, "Back button clicked");\r
-                        InputGeneratorBase.OnKeyEvent();\r
-                    };\r
-                }\r
                 Tizen.Log.Info(Resources.LogTag, "Buttons Added");\r
             }
         }\r

diff --git a/packaging/org.tizen.TrayApplication-1.0.0.tpk b/packaging/org.tizen.TrayApplication-1.0.0.tpk
old mode 100755 (executable)
new mode 100644 (file)
index 9effc77..05716b6
Binary files a/packaging/org.tizen.TrayApplication-1.0.0.tpk and b/packaging/org.tizen.TrayApplication-1.0.0.tpk differ