Preventing settings app to get displayed in ApplicationsView.

Change-Id: I055dd2074fc8f592d81d314314feae6eafc8f595
Signed-off-by: Shivam Varshney/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics <shivam.v2@samsung.com>

diff --git a/TaskBar/TextResources/LanguageResources.Designer.cs b/TaskBar/TextResources/LanguageResources.Designer.cs
index dcc22bb..f9ab030 100644 (file)
--- a/TaskBar/TextResources/LanguageResources.Designer.cs
+++ b/TaskBar/TextResources/LanguageResources.Designer.cs
@@ -19,7 +19,7 @@ namespace TaskBar.TextResources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class LanguageResources {

diff --git a/TaskBar/ViewModels/ApplicationsViewModel.cs b/TaskBar/ViewModels/ApplicationsViewModel.cs
index c4543ee..7c5979c 100644 (file)
--- a/TaskBar/ViewModels/ApplicationsViewModel.cs
+++ b/TaskBar/ViewModels/ApplicationsViewModel.cs
@@ -62,7 +62,7 @@ namespace TaskBar.ViewModels
             try
             {
                 ApplicationInfo appInfo = ApplicationManager.GetInstalledApplication(e.ApplicationRunningContext.ApplicationId);
-                if (appInfo == null || string.IsNullOrEmpty(appInfo.IconPath) || appInfo.IsNoDisplay == true)
+                if (appInfo == null || string.IsNullOrEmpty(appInfo.IconPath) || appInfo.IsNoDisplay == true || IsAppDisplayDisallowed(appInfo.ApplicationId) == true)
                 {
                     return;
                 }
@@ -244,7 +244,10 @@ namespace TaskBar.ViewModels
                 allAppsInfo.Remove(appId);
             }
             AddButtonsInfo();
-            appInfoModelDictionary[appId].IsRunning = false;
+            if (appInfoModelDictionary.ContainsKey(appId))
+            {
+                appInfoModelDictionary[appId].IsRunning = false;
+            }
         }
 
         private void CreateUninstallConfirmationView(string appId)
@@ -256,6 +259,15 @@ namespace TaskBar.ViewModels
             };
         }
 
+        private bool IsAppDisplayDisallowed(string appId)
+        {
+            if (appId == "org.tizen.cssettings" && pinnedAppsInfo.ContainsKey(appId) == false)
+            {
+                return true;
+            }
+            return false;
+        }
+
         public void Dispose()
         {
             Dispose(true);

diff --git a/packaging/org.tizen.taskbar-1.0.0.tpk b/packaging/org.tizen.taskbar-1.0.0.tpk
index 732aa55..27edee4 100644 (file)
Binary files a/packaging/org.tizen.taskbar-1.0.0.tpk and b/packaging/org.tizen.taskbar-1.0.0.tpk differ