From 864b04ef0db9e4da9a7dca435b9a7d35bb68bd1e Mon Sep 17 00:00:00 2001
From: Hyerim Kim <rimi.kim@samsung.com>
Date: Sat, 15 Apr 2017 17:20:39 +0900
Subject: [PATCH] Modifies a bug and remove unuse function  - When back button
 is pressed in move mode, revert ButtonViewList  - remove SetDefaultAppList()
 in MainPageViewModel

Change-Id: I9b39d41f30605518567906f4a81febf3a8ea4163
Signed-off-by: Hyerim Kim <rimi.kim@samsung.com>
---
 TVHome/TVHome/ViewModels/MainPageViewModel.cs | 10 ----------
 TVHome/TVHome/Views/SubPanel.xaml.cs          | 13 +++++++++++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/TVHome/TVHome/ViewModels/MainPageViewModel.cs b/TVHome/TVHome/ViewModels/MainPageViewModel.cs
index b7ee6e3..2964edd 100755
--- a/TVHome/TVHome/ViewModels/MainPageViewModel.cs
+++ b/TVHome/TVHome/ViewModels/MainPageViewModel.cs
@@ -179,7 +179,6 @@ namespace TVHome.ViewModels
             MakeMainMenuItems();
             InitStatus();
             InitCommands();
-            SetDefaultAppList();
             MakeSettingsButtons();
 
             UpdateAppList(null, null);
@@ -344,15 +343,6 @@ namespace TVHome.ViewModels
             OnPropertyChanged("MainList");
         }
 
-        /// <summary>
-        /// Gets default AppList for displaying items and updates the list to Apps SubPanel
-        /// </summary>
-        private void SetDefaultAppList()
-        {
-            AppList = TVHomeImpl.GetInstance.AppShortcutControllerInstance.GetDefaultShortcuts();
-            OnPropertyChanged("AppList");
-        }
-
         /// <summary>
         /// Gets the AppList for displaying items and updates the list to Apps SubPanel
         /// </summary>
diff --git a/TVHome/TVHome/Views/SubPanel.xaml.cs b/TVHome/TVHome/Views/SubPanel.xaml.cs
index a767bcd..fa810a9 100755
--- a/TVHome/TVHome/Views/SubPanel.xaml.cs
+++ b/TVHome/TVHome/Views/SubPanel.xaml.cs
@@ -184,6 +184,10 @@ namespace TVHome.Views
             }
         }
 
+        /// <summary>
+        /// A method is called when apps subpanel is changed to move mode and change item's IsEnabled property.
+        /// </summary>
+        /// <param name="selectedBtn">A selected button view to move</param>
         private void ChangeIsEnabledProperty(View selectedBtn)
         {
             foreach (var item in PanelButtonStack.Children)
@@ -276,6 +280,9 @@ namespace TVHome.Views
             await this.FadeTo(0.99, 300);
         }
 
+        /// <summary>
+        /// A method is called when back button is pressed in move mode
+        /// </summary>
         public void ChangeToDefaultMode()
         {
             if (isMoveMode)
@@ -297,6 +304,12 @@ namespace TVHome.Views
 
                 OnMoveCommand.Execute(isMoveMode);
                 ChangeLayoutButtons(isMoveMode);
+
+                ButtonViewList.Clear();
+                foreach (var stackItem in PanelButtonStack.Children)
+                {
+                    ButtonViewList.Add(stackItem);
+                }
             }
         }
 
-- 
2.34.1