1. Add Settings Icon in setting subpanel

2. Change AppControlID of Recent.

Change-Id: I1fa0a54291d04dfa63c38d40ec90608d99b7e6ff
Signed-off-by: Hyerim Kim <rimi.kim@samsung.com>

diff --git a/LibTVRefCommonPortable/Models/SettingShortcutController.cs b/LibTVRefCommonPortable/Models/SettingShortcutController.cs
old mode 100644 (file)
new mode 100755 (executable)
index e899de7..3f35578
--- a/LibTVRefCommonPortable/Models/SettingShortcutController.cs
+++ b/LibTVRefCommonPortable/Models/SettingShortcutController.cs
@@ -27,6 +27,9 @@ namespace LibTVRefCommonPortable.Models
 
         public SettingShortcutController()
         {
+            ShortcutInfo settings = SettingShortcutFactory.Get(SettingID.SETTINGS);
+            settingShortcutList.Add(settings);
+
             ShortcutInfo wifi = SettingShortcutFactory.Get(SettingID.WiFi);
             settingShortcutList.Add(wifi);
 

diff --git a/LibTVRefCommonPortable/Models/SettingShortcutFactory.cs b/LibTVRefCommonPortable/Models/SettingShortcutFactory.cs
index 143758a..4830e32 100755 (executable)
--- a/LibTVRefCommonPortable/Models/SettingShortcutFactory.cs
+++ b/LibTVRefCommonPortable/Models/SettingShortcutFactory.cs
@@ -20,6 +20,7 @@ namespace LibTVRefCommonPortable.Models
 {
     public enum SettingID
     {
+        SETTINGS,
         WiFi,
         BLUETOOTH
     };
@@ -31,6 +32,27 @@ namespace LibTVRefCommonPortable.Models
             ShortcutInfo sc;
             switch (id)
             {
+                case SettingID.SETTINGS:
+                    sc = new AppShortcutInfo()
+                    {
+                        StateDescriptions =
+                        {
+                            {
+                                "default",
+                                new StateDescription
+                                {
+                                    Label = "Settings",
+                                    IconPath = "ic_tizen_home_menu_settings_selected.png",
+                                    Action = new AppControlAction() {
+                                        AppID = "org.tizen.settings"
+                                    },
+                                }
+                            },
+                        }
+                    };
+                    sc.UpdateState();
+                    return sc;
+
                 case SettingID.WiFi:
                     sc = new WiFiSettingShortcutInfo()
                     {

diff --git a/TVHome/TVHome/ViewModels/MainPageViewModel.cs b/TVHome/TVHome/ViewModels/MainPageViewModel.cs
index bcbb686..ba4522b 100755 (executable)
--- a/TVHome/TVHome/ViewModels/MainPageViewModel.cs
+++ b/TVHome/TVHome/ViewModels/MainPageViewModel.cs
@@ -130,7 +130,7 @@ namespace TVHome.ViewModels
             string[] AppName = { "Recent", "Apps", "Settings" };
             // TODO : Revert this before release
             //string[] AppControlID = { "org.tizen.settings", "org.tizen.apps", "org.tizen.settings" };
-            string[] AppControlID = { "org.tizen.settings", "org.tizen.example.TVApps.TizenTV", "org.tizen.settings" };
+            string[] AppControlID = { "org.tizen.example.TVApps.TizenTV", "org.tizen.example.TVApps.TizenTV", "org.tizen.settings" };
             string[] AppDefaultIconPath = { "ic_tizen_home_menu_recent_normal.png", "ic_tizen_home_menu_apps_normal.png", "ic_tizen_home_menu_settings_normal.png" };
             string[] AppFocusedIconPath = { "ic_tizen_home_menu_recent_focused.png", "ic_tizen_home_menu_apps_focused.png", "ic_tizen_home_menu_settings_focused.png" };
             string[] AppSelectedIconPath = { "ic_tizen_home_menu_recent_selected.png", "ic_tizen_home_menu_apps_selected.png", "ic_tizen_home_menu_settings_selected.png" };

diff --git a/TVHome/TVHome/Views/SubPanel.xaml.cs b/TVHome/TVHome/Views/SubPanel.xaml.cs
index 7da3f09..547155e 100755 (executable)
--- a/TVHome/TVHome/Views/SubPanel.xaml.cs
+++ b/TVHome/TVHome/Views/SubPanel.xaml.cs
@@ -58,7 +58,8 @@ namespace TVHome.Views
                 PanelButton button;
 
                 if (item.StateDescriptions["default"].Label.Equals("All apps")
-                    || item.StateDescriptions["default"].Label.Equals("Add pin"))
+                    || item.StateDescriptions["default"].Label.Equals("Add pin")
+                    || item.StateDescriptions["default"].Label.Equals("Settings"))
                 {
                     button = new SubPanelAllAppsButton();
                 }