Fixed self verification issue : TPLAPP-3984

 - The subpanel icon is overlapped when the subpanel is changed to the move mode.
 - After moving subpanel item, it can't be moved focus using remote control direction key.

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

5 files changed, 21 insertions, 16 deletions

diff --git a/TVHome/TVHome/Controls/SubPanelButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
index 9f671fe..7eca2fc 100755
--- a/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
@@ -111,7 +111,7 @@ namespace TVHome.Controls
                 popup = null;
                 if (!IsButtonMoving)
                 {
-                    PanelButtonState = PanelButtonState.Focused;
+                    PanelButtonState = PanelButtonState.Show;
                 }
             };
 
diff --git a/TVHome/TVHome/Views/MainPage.xaml.cs b/TVHome/TVHome/Views/MainPage.xaml.cs
index 9fbcfe6..a5cbdfd 100755
--- a/TVHome/TVHome/Views/MainPage.xaml.cs
+++ b/TVHome/TVHome/Views/MainPage.xaml.cs
@@ -114,7 +114,7 @@ namespace TVHome.Views
             AppsSubPanel.OnPanelShowing();
             SettingsSubPanel.OnPanelHiding();
 
-            PropertyChanged += MainPage_PropertyChanged;
+            PropertyChanged += MainPagePropertyChanged;
 
             App.SetHomeKeyListener((e, arg) =>
             {
@@ -160,10 +160,7 @@ namespace TVHome.Views
 
             AppsSubPanel.ItemSourceChanged += (s, e) =>
             {
-                if (CurrentState != AppState.HomeMove)
-                {
-                    InitializeAppsSubPanelButtonFocusChain();
-                }
+                InitializeAppsSubPanelButtonFocusChain();
             };
 
             InitializeMainPanelButtonFocusChain();
@@ -242,7 +239,7 @@ namespace TVHome.Views
         /// </summary>
         /// <param name="sender">The source of event</param>
         /// <param name="e">The event that is occurred when property is changed</param>
-        private void MainPage_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        private void MainPagePropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             if (e.PropertyName.CompareTo("CurrentState") == 0)
             {
diff --git a/TVHome/TVHome/Views/MainPanel.xaml.cs b/TVHome/TVHome/Views/MainPanel.xaml.cs
index 918276b..dc73664 100755
--- a/TVHome/TVHome/Views/MainPanel.xaml.cs
+++ b/TVHome/TVHome/Views/MainPanel.xaml.cs
@@ -20,7 +20,6 @@ using LibTVRefCommonPortable.DataModels;
 using TVHome.ViewModels;
 using Xamarin.Forms;
 using LibTVRefCommonPortable.Utils;
-using System;
 
 namespace TVHome.Views
 {
@@ -213,19 +212,21 @@ namespace TVHome.Views
 
         public override void OnOptionMenuShowing()
         {
-            this.FadeTo(0, 300);
             IsVisible = false;
         }
 
-        public override void OnOptionMenuHiding()
+        public override void OnOptionMenuHiding(bool isMoveMode = false)
         {
-            this.FadeTo(1, 300);
+            if (isMoveMode)
+            {
+                return;
+            }
+
             IsVisible = true;
         }
 
         public override void OnMoveStarting()
         {
-            IsVisible = false;
         }
 
         public override void OnMoveFinishing()
diff --git a/TVHome/TVHome/Views/Panel.cs b/TVHome/TVHome/Views/Panel.cs
index ea216e0..0124232 100755
--- a/TVHome/TVHome/Views/Panel.cs
+++ b/TVHome/TVHome/Views/Panel.cs
@@ -171,7 +171,7 @@ namespace TVHome.Views
 
         public abstract void OnOptionMenuShowing();
 
-        public abstract void OnOptionMenuHiding();
+        public abstract void OnOptionMenuHiding(bool isMoveMode = false);
 
         public abstract void OnMoveStarting();
 
@@ -207,7 +207,14 @@ namespace TVHome.Views
                 switch (previousPanelState)
                 {
                     case PanelState.ShowingOption:
-                        OnOptionMenuHiding();
+                        if (PanelState == PanelState.Moving)
+                        {
+                            OnOptionMenuHiding(true);
+                        }
+                        else
+                        {
+                            OnOptionMenuHiding();
+                        }
                         break;
                     case PanelState.Moving:
                         OnMoveFinishing();
diff --git a/TVHome/TVHome/Views/SubPanel.xaml.cs b/TVHome/TVHome/Views/SubPanel.xaml.cs
index a0234c3..6bb8bab 100755
--- a/TVHome/TVHome/Views/SubPanel.xaml.cs
+++ b/TVHome/TVHome/Views/SubPanel.xaml.cs
@@ -390,10 +390,10 @@ namespace TVHome.Views
             var bounds = Bounds;
             bounds.Height += 300;
             bounds.Y -= 300;
-            this.LayoutTo(bounds, 0);
+            this.LayoutTo(bounds, 167);
         }
 
-        public override void OnOptionMenuHiding()
+        public override void OnOptionMenuHiding(bool isMoveMode = false)
         {
             DebuggingUtils.Dbg("OnHidingOptiongMenu - SubPanel");
             var bounds = Bounds;