From: Heonjae.Jang <Heonjae.Jang@samsung.com>
Date: Wed, 6 Sep 2017 07:43:45 +0000 (+0900)
Subject: Remove comment for using TizenSpecific
X-Git-Tag: submit/tizen_4.0/20170911.075016~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5544f60becfc8fa7829ae20bdff8666eb6f3962;p=profile%2Ftv%2Fapps%2Fdotnet%2Fhome.git

Remove comment for using TizenSpecific

Change-Id: I7b9352e428f3e33a818bbe602a28ce003f4fc365
Signed-off-by: Heonjae.Jang <Heonjae.Jang@samsung.com>
---

diff --git a/LibCommon.Shared/LibCommon.Shared.csproj b/LibCommon.Shared/LibCommon.Shared.csproj
index 21691c0..cdba422 100644
--- a/LibCommon.Shared/LibCommon.Shared.csproj
+++ b/LibCommon.Shared/LibCommon.Shared.csproj
@@ -4,9 +4,13 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);NU1605</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Tizen.Xamarin.Forms.Extension" Version="2.4.0-v00005" />
-    <PackageReference Include="Xamarin.Forms" Version="2.4.0.266-pre1" />
+    <PackageReference Include="Xamarin.Forms" Version="2.4.0-r266-006" />
   </ItemGroup>
 
 </Project>
diff --git a/LibCommon.Tizen/LibCommon.Tizen.csproj b/LibCommon.Tizen/LibCommon.Tizen.csproj
index a57be02..e9ae655 100644
--- a/LibCommon.Tizen/LibCommon.Tizen.csproj
+++ b/LibCommon.Tizen/LibCommon.Tizen.csproj
@@ -4,10 +4,14 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);NU1605</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Tizen.NET" Version="4.0.0-preview1-00143" />
     <PackageReference Include="Tizen.Xamarin.Forms.Extension" Version="2.4.0-v00005" />
-    <PackageReference Include="Xamarin.Forms" Version="2.4.0.266-pre1" />
+    <PackageReference Include="Xamarin.Forms" Version="2.4.0-r266-006" />
     <PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.4.0-r266-006" />
   </ItemGroup>
 
diff --git a/LibCommon.Tizen/Ports/MediaContentPort.cs b/LibCommon.Tizen/Ports/MediaContentPort.cs
index ccc610b..bd41cc4 100644
--- a/LibCommon.Tizen/Ports/MediaContentPort.cs
+++ b/LibCommon.Tizen/Ports/MediaContentPort.cs
@@ -51,7 +51,7 @@ namespace LibTVRefCommonTizen.Ports
             var selectArguments = new SelectArguments();
 
             selectArguments.SortOrder = "MEDIA_LAST_PLAYED_TIME";
-            //contentFilter.OrderKey = "MEDIA_LAST_PLAYED_TIME";           
+            //contentFilter.OrderKey = "MEDIA_LAST_PLAYED_TIME";
             //contentFilter.Order = ContentOrder.Desc;
             selectArguments.FilterExpression = "MEDIA_TYPE=1 AND MEDIA_LAST_PLAYED_TIME!=0";
             selectArguments.StartRowIndex = 0;
diff --git a/TVApps/TVApps.Tizen.TV/TVApps.Tizen.TV.csproj b/TVApps/TVApps.Tizen.TV/TVApps.Tizen.TV.csproj
index e0d9483..9a1eebc 100644
--- a/TVApps/TVApps.Tizen.TV/TVApps.Tizen.TV.csproj
+++ b/TVApps/TVApps.Tizen.TV/TVApps.Tizen.TV.csproj
@@ -22,6 +22,10 @@
     <DebugType>None</DebugType>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);NU1605</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <Folder Include="lib\" />
     <Folder Include="res\" />
@@ -36,7 +40,7 @@
     <PackageReference Include="Tizen.NET" Version="4.0.0-preview1-00143" />
     <PackageReference Include="Tizen.NET.Sdk" Version="0.9.18-pre1" />
     <PackageReference Include="Tizen.Xamarin.Forms.Extension" Version="2.4.0-v00005" />
-    <PackageReference Include="Xamarin.Forms" Version="2.4.0.266-pre1" />
+    <PackageReference Include="Xamarin.Forms" Version="2.4.0-r266-006" />
     <PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.4.0-r266-006" />
   </ItemGroup>
   <ItemGroup>
diff --git a/TVApps/TVApps/Controls/AppItemCell.xaml.cs b/TVApps/TVApps/Controls/AppItemCell.xaml.cs
index 33bcd0e..7e5c3a2 100755
--- a/TVApps/TVApps/Controls/AppItemCell.xaml.cs
+++ b/TVApps/TVApps/Controls/AppItemCell.xaml.cs
@@ -24,6 +24,7 @@ using Tizen.Xamarin.Forms.Extension;
 namespace TVApps.Controls
 {
     using LibTVRefCommonPortable.DataModels;
+    using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
     using Tizen = Xamarin.Forms.PlatformConfiguration.Tizen;
     /// <summary>
     /// An enumeration for AppItemCell icon size
@@ -203,7 +204,7 @@ namespace TVApps.Controls
 
             ButtonTitle.PropertyChanged += ButtonTitlePropertyChanged;
             PropertyChanged += AppItemCellPropertyChanged;
-            //ButtonTitle.On<Tizen>().SetFontWeight(FontWeight.Normal);
+            ButtonTitle.On<Tizen>().SetFontWeight(FontWeight.Normal);
 
         }
 
diff --git a/TVApps/TVApps/TVApps.csproj b/TVApps/TVApps/TVApps.csproj
index 0a45e6a..7b63e4b 100755
--- a/TVApps/TVApps/TVApps.csproj
+++ b/TVApps/TVApps/TVApps.csproj
@@ -4,9 +4,13 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);NU1605</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Tizen.Xamarin.Forms.Extension" Version="2.4.0-v00005" />
-    <PackageReference Include="Xamarin.Forms" Version="2.4.0.266-pre1" />
+    <PackageReference Include="Xamarin.Forms" Version="2.4.0-r266-006" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TVApps/TVApps/Views/FooterPinStatus.xaml.cs b/TVApps/TVApps/Views/FooterPinStatus.xaml.cs
index 95d2480..25a7db0 100755
--- a/TVApps/TVApps/Views/FooterPinStatus.xaml.cs
+++ b/TVApps/TVApps/Views/FooterPinStatus.xaml.cs
@@ -16,6 +16,7 @@
 
 using LibTVRefCommonPortable.Utils;
 using Xamarin.Forms;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVApps.Views
 {
@@ -145,7 +146,7 @@ namespace TVApps.Views
                 Opacity = 0.7,
                 HorizontalTextAlignment = TextAlignment.Start,
             };
-            //AppNameLabel.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
+            AppNameLabel.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
 
             AfterLabel = new Xamarin.Forms.Label()
             {
@@ -156,7 +157,7 @@ namespace TVApps.Views
                 Opacity = 0.7,
                 HorizontalTextAlignment = TextAlignment.Start
             };
-            //AfterLabel.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Light);
+            AfterLabel.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Light);
 
             PropertyChanged += FooterPinStatusPropertyChanged;
         }
diff --git a/TVApps/TVApps/Views/MainPage.xaml.cs b/TVApps/TVApps/Views/MainPage.xaml.cs
index c2f359a..8046227 100755
--- a/TVApps/TVApps/Views/MainPage.xaml.cs
+++ b/TVApps/TVApps/Views/MainPage.xaml.cs
@@ -25,6 +25,7 @@ using System.Windows.Input;
 using System.Collections.Generic;
 using System.Linq;
 using Tizen.Xamarin.Forms.Extension;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVApps.Views
 {
@@ -158,7 +159,7 @@ namespace TVApps.Views
             BackKeyInfoImage.HeightRequest = backKeyImageSize;
             BackKeyInfo.FontSize = SizeUtils.GetFontSize(28);
             BackKeyInfo.Margin = new Thickness(SizeUtils.GetWidthSize(6), 0, 0, 0);
-            //BackKeyInfo.On<Tizen>().SetFontWeight(FontWeight.Normal);
+            BackKeyInfo.On<Tizen>().SetFontWeight(FontWeight.Normal);
 
             PropertyChanged += MainPagePropertyChanged;
             SetCurrentStatus(AppsStatus.Default);
@@ -237,20 +238,21 @@ namespace TVApps.Views
 
                 if (i == 1)
                 {
-                    //prevButton?.On<Tizen>()?.SetNextFocusDownView(
-                    //    lowerList[i - 1].FindByName<Button>("ButtonFocusArea"));
+                    prevButton?.On<Tizen>()?.SetNextFocusDownView(
+                        lowerList[i - 1].FindByName<Button>("ButtonFocusArea"));
                 }
 
-                //button?.On<Tizen>()?.SetNextFocusDownView(
-                //    lowerList[i].FindByName<Button>("ButtonFocusArea"));
+                button?.On<Tizen>()?.SetNextFocusDownView(
+                    lowerList[i].FindByName<Button>("ButtonFocusArea"));
 
                 if (i == upperCount - 2)
                 {
-                    //button?.On<Tizen>()?.SetNextFocusDownView(lowerList[i].FindByName<Button>("ButtonFocusArea"));
+                    button?.On<Tizen>()?.SetNextFocusDownView(
+                        lowerList[i].FindByName<Button>("ButtonFocusArea"));
 
-                    //nextButton?.On<Tizen>()?.SetNextFocusRightView(nextButton);
-                    //nextButton?.On<Tizen>()?.SetNextFocusDownView(
-                    //    lowerList[lowerCount - 1].FindByName<Button>("ButtonFocusArea"));
+                    nextButton?.On<Tizen>()?.SetNextFocusRightView(nextButton);
+                    nextButton?.On<Tizen>()?.SetNextFocusDownView(
+                        lowerList[lowerCount - 1].FindByName<Button>("ButtonFocusArea"));
                 }
             }
 
@@ -265,24 +267,24 @@ namespace TVApps.Views
 
                 if (i == 1)
                 {
-                    //prevButton?.On<Tizen>()?.SetNextFocusUpView(
-                    //    upperList[i - 1].FindByName<Button>("ButtonFocusArea"));
+                    prevButton?.On<Tizen>()?.SetNextFocusUpView(
+                        upperList[i - 1].FindByName<Button>("ButtonFocusArea"));
                 }
 
-                //button?.On<Tizen>()?.SetNextFocusUpView(
-                //    upperList[i].FindByName<Button>("ButtonFocusArea"));
+                button?.On<Tizen>()?.SetNextFocusUpView(
+                    upperList[i].FindByName<Button>("ButtonFocusArea"));
 
                 if (i == lowerCount - 2)
                 {
-                    //nextButton?.On<Tizen>()?.SetNextFocusUpView(upperList[i + 1].FindByName<Button>("ButtonFocusArea"));
+                    nextButton?.On<Tizen>()?.SetNextFocusUpView(upperList[i + 1].FindByName<Button>("ButtonFocusArea"));
 
                     if (upperCount > lowerCount)
                     {
-                        //nextButton?.On<Tizen>()?.SetNextFocusRightView(upperList[upperCount - 1].FindByName<Button>("ButtonFocusArea"));
+                        nextButton?.On<Tizen>()?.SetNextFocusRightView(upperList[upperCount - 1].FindByName<Button>("ButtonFocusArea"));
                     }
                     else
                     {
-                        //nextButton?.On<Tizen>()?.SetNextFocusRightView(nextButton);
+                        nextButton?.On<Tizen>()?.SetNextFocusRightView(nextButton);
                     }
                 }
             }
@@ -297,8 +299,8 @@ namespace TVApps.Views
         /// <param name="right">A right App icon</param>
         private void SetFocusChainingLeftAndRight(Button left, Button right)
         {
-            //left?.On<Tizen>()?.SetNextFocusRightView(right);
-            //right?.On<Tizen>()?.SetNextFocusLeftView(left);
+            left?.On<Tizen>()?.SetNextFocusRightView(right);
+            right?.On<Tizen>()?.SetNextFocusLeftView(left);
         }
 
         /// <summary>
@@ -312,7 +314,7 @@ namespace TVApps.Views
             foreach (var item in lowerList)
             {
                 Button button = item.FindByName<Button>("ButtonFocusArea");
-                //button?.On<Tizen>()?.SetNextFocusDownView(sortList);
+                button?.On<Tizen>()?.SetNextFocusDownView(sortList);
             }
         }
 
@@ -327,15 +329,15 @@ namespace TVApps.Views
             foreach (var item in lowerList)
             {
                 Button button = item.FindByName<Button>("ButtonFocusArea");
-                //button?.On<Tizen>()?.SetNextFocusDownView(cancelButton);
+                button?.On<Tizen>()?.SetNextFocusDownView(cancelButton);
             }
 
             if (lowerList.Count > 0)
             {
-                //cancelButton?.On<Tizen>()?.SetNextFocusUpView(lowerList[lowerList.Count - 1].FindByName<Button>("ButtonFocusArea"));
+                cancelButton?.On<Tizen>()?.SetNextFocusUpView(lowerList[lowerList.Count - 1].FindByName<Button>("ButtonFocusArea"));
             }
 
-            //cancelButton?.On<Tizen>()?.SetNextFocusLeftView(cancelButton);
+            cancelButton?.On<Tizen>()?.SetNextFocusLeftView(cancelButton);
         }
 
         /// <summary>
@@ -349,15 +351,15 @@ namespace TVApps.Views
             foreach (var item in lowerList)
             {
                 Button button = item.FindByName<Button>("ButtonFocusArea");
-                //button?.On<Tizen>()?.SetNextFocusDownView(doneButton);
+                button?.On<Tizen>()?.SetNextFocusDownView(doneButton);
             }
 
             if (lowerList.Count > 0)
             {
-                //doneButton?.On<Tizen>()?.SetNextFocusUpView(lowerList[lowerList.Count - 1].FindByName<Button>("ButtonFocusArea"));
+                doneButton?.On<Tizen>()?.SetNextFocusUpView(lowerList[lowerList.Count - 1].FindByName<Button>("ButtonFocusArea"));
             }
 
-            //doneButton?.On<Tizen>()?.SetNextFocusLeftView(doneButton);
+            doneButton?.On<Tizen>()?.SetNextFocusLeftView(doneButton);
         }
 
         /// <summary>
diff --git a/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj b/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj
index e34c54b..faa60d9 100644
--- a/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj
+++ b/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj
@@ -22,6 +22,10 @@
     <DebugType>None</DebugType>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);NU1605</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <Folder Include="lib\" />
   </ItemGroup>
@@ -35,7 +39,7 @@
     <PackageReference Include="Tizen.NET" Version="4.0.0-preview1-00143" />
     <PackageReference Include="Tizen.NET.Sdk" Version="0.9.18-pre1" />
     <PackageReference Include="Tizen.Xamarin.Forms.Extension" Version="2.4.0-v00005" />
-    <PackageReference Include="Xamarin.Forms" Version="2.4.0.266-pre1" />
+    <PackageReference Include="Xamarin.Forms" Version="2.4.0-r266-006" />
     <PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.4.0-r266-006" />
   </ItemGroup>
   <ItemGroup>
diff --git a/TVHome/TVHome/Controls/MainPanelButton.xaml.cs b/TVHome/TVHome/Controls/MainPanelButton.xaml.cs
index cef0a9a..0d731aa 100755
--- a/TVHome/TVHome/Controls/MainPanelButton.xaml.cs
+++ b/TVHome/TVHome/Controls/MainPanelButton.xaml.cs
@@ -17,6 +17,7 @@
 using LibTVRefCommonPortable.Utils;
 using System;
 using Xamarin.Forms;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVHome.Controls
 {
@@ -49,7 +50,7 @@ namespace TVHome.Controls
             WidthRequest = SizeUtils.GetWidthSize(236);
             HeightRequest = SizeUtils.GetHeightSize(260);
             ButtonTitle.FontSize = SizeUtils.GetFontSize(26);
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
 
             PropertyChanged += MainPanelButton_PropertyChanged;
         }
diff --git a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs
index 013c6f6..4ce34ec 100755
--- a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs
@@ -17,6 +17,7 @@
 using LibTVRefCommonPortable.Utils;
 using System;
 using Xamarin.Forms;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVHome.Controls
 {
@@ -40,7 +41,7 @@ namespace TVHome.Controls
             WidthRequest = SizeUtils.GetWidthSize(182);
             HeightRequest = SizeUtils.GetHeightSize(230);
             ButtonTitle.FontSize = SizeUtils.GetFontSize(26);
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
         }
 
         /// <summary>
@@ -65,7 +66,7 @@ namespace TVHome.Controls
             OnFocusedCommand?.Execute("");
 
 #pragma warning disable CS4014
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
             ButtonTitle.FadeTo(0.99, 300);
             ButtonTitle.TranslateTo(0, selectTransitionHeight, 300);
 #pragma warning restore CS4014
@@ -81,7 +82,7 @@ namespace TVHome.Controls
         public override async void OnUnfocused(object sender, FocusEventArgs e)
         {
 #pragma warning disable CS4014
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
             ButtonTitle.FadeTo(0.5, 300);
             ButtonTitle.TranslateTo(0, 0, 300);
 #pragma warning restore CS4014
diff --git a/TVHome/TVHome/Controls/SubPanelButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
index 6c8bd8a..9f671fe 100755
--- a/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
@@ -18,6 +18,7 @@ using System;
 using LibTVRefCommonPortable.Utils;
 using Xamarin.Forms;
 using Tizen.Xamarin.Forms.Extension;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVHome.Controls
 {
@@ -46,7 +47,7 @@ namespace TVHome.Controls
             WidthRequest = SizeUtils.GetWidthSize(182);
             HeightRequest = SizeUtils.GetHeightSize(230);
             ButtonTitle.FontSize = SizeUtils.GetFontSize(26);
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
 
             // TODO : make this subscribe when it is in the move mode.
             MessagingCenter.Subscribe<App, string>(this, "NavigationKeyPressed", (sender, e) =>
@@ -220,7 +221,7 @@ namespace TVHome.Controls
             OnFocusedCommand?.Execute("");
 
 #pragma warning disable CS4014
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
             ButtonTitle.FadeTo(0.8, 300);
             ButtonTitle.TranslateTo(0, selectTransitionHeight, 300);
 #pragma warning restore CS4014
@@ -246,7 +247,7 @@ namespace TVHome.Controls
             PanelButtonState = PanelButtonState.Show;
 
 #pragma warning disable CS4014
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
             ButtonTitle.FadeTo(0.6, 300);
             ButtonTitle.TranslateTo(0, 0, 300);
 #pragma warning restore CS4014
diff --git a/TVHome/TVHome/Controls/SubPanelSettingButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelSettingButton.xaml.cs
index 1d25cd3..f5c6eff 100755
--- a/TVHome/TVHome/Controls/SubPanelSettingButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelSettingButton.xaml.cs
@@ -17,6 +17,7 @@
 using LibTVRefCommonPortable.Utils;
 using System;
 using Xamarin.Forms;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVHome.Controls
 {
@@ -40,7 +41,7 @@ namespace TVHome.Controls
             WidthRequest = SizeUtils.GetWidthSize(182);
             HeightRequest = SizeUtils.GetHeightSize(230);
             ButtonTitle.FontSize = SizeUtils.GetFontSize(26);
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
         }
 
         /// <summary>
@@ -65,7 +66,7 @@ namespace TVHome.Controls
             OnFocusedCommand?.Execute("");
 
 #pragma warning disable CS4014
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
             ButtonTitle.FadeTo(0.99, 300);
             ButtonTitle.TranslateTo(0, selectTransitionHeight, 300);
 #pragma warning restore CS4014
@@ -81,7 +82,7 @@ namespace TVHome.Controls
         public override async void OnUnfocused(object sender, FocusEventArgs e)
         {
 #pragma warning disable CS4014
-            //ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
             ButtonTitle.FadeTo(0.5, 300);
             ButtonTitle.TranslateTo(0, 0, 300);
 #pragma warning restore CS4014
diff --git a/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs
index 88ef787..b0a487e 100755
--- a/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs
@@ -17,6 +17,7 @@ using LibTVRefCommonPortable.Utils;
 using System;
 using Tizen.Xamarin.Forms.Extension;
 using Xamarin.Forms;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVHome.Controls
 {
@@ -35,7 +36,7 @@ namespace TVHome.Controls
             WidthRequest = SizeUtils.GetWidthSize(320);
             HeightRequest = SizeUtils.GetHeightSize(180);
             ThumbnailTitle.FontSize = SizeUtils.GetFontSize(26);
-            //ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
 
         }
 
@@ -66,7 +67,7 @@ namespace TVHome.Controls
 
 #pragma warning disable CS4014
             ThumbnailGradient.Source = "ic_list_thumbnail_gradient_focused.9.png";
-            //ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
+            ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium);
             //ThumbnailTitle.FadeTo(0.8, 300);
 #pragma warning restore CS4014
             await this.ScaleTo(1.2, 300);
@@ -89,7 +90,7 @@ namespace TVHome.Controls
 #pragma warning disable CS4014
             //ThumbnailTitle.FadeTo(0.3, 300);
             ThumbnailGradient.Source = "ic_list_thumbnail_gradient_normal.9.png";
-            //ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
+            ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal);
 #pragma warning restore CS4014
             await this.ScaleTo(1.0, 300);
         }
diff --git a/TVHome/TVHome/TVHome.csproj b/TVHome/TVHome/TVHome.csproj
index 0a45e6a..7b63e4b 100755
--- a/TVHome/TVHome/TVHome.csproj
+++ b/TVHome/TVHome/TVHome.csproj
@@ -4,9 +4,13 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);NU1605</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Tizen.Xamarin.Forms.Extension" Version="2.4.0-v00005" />
-    <PackageReference Include="Xamarin.Forms" Version="2.4.0.266-pre1" />
+    <PackageReference Include="Xamarin.Forms" Version="2.4.0-r266-006" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TVHome/TVHome/Views/MainPage.xaml.cs b/TVHome/TVHome/Views/MainPage.xaml.cs
index d015a70..23e505b 100755
--- a/TVHome/TVHome/Views/MainPage.xaml.cs
+++ b/TVHome/TVHome/Views/MainPage.xaml.cs
@@ -18,6 +18,7 @@ using System.Collections.Generic;
 using LibTVRefCommonPortable.Utils;
 using Xamarin.Forms;
 using TVHome.ViewModels;
+using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVHome.Views
 {
@@ -188,12 +189,12 @@ namespace TVHome.Views
             Button appsMainPanelButton = PageMainPanel.GetButtonToFocusing(1);
             Button settingMainPanelButton = PageMainPanel.GetButtonToFocusing(2);
 
-            //recentMainPanelButton.On<Tizen>().SetNextFocusLeftView(recentMainPanelButton);
-            //recentMainPanelButton.On<Tizen>().SetNextFocusRightView(appsMainPanelButton);
-            //appsMainPanelButton.On<Tizen>().SetNextFocusLeftView(recentMainPanelButton);
-            //appsMainPanelButton.On<Tizen>().SetNextFocusRightView(settingMainPanelButton);
-            //settingMainPanelButton.On<Tizen>().SetNextFocusLeftView(appsMainPanelButton);
-            //settingMainPanelButton.On<Tizen>().SetNextFocusRightView(settingMainPanelButton);
+            recentMainPanelButton.On<Tizen>().SetNextFocusLeftView(recentMainPanelButton);
+            recentMainPanelButton.On<Tizen>().SetNextFocusRightView(appsMainPanelButton);
+            appsMainPanelButton.On<Tizen>().SetNextFocusLeftView(recentMainPanelButton);
+            appsMainPanelButton.On<Tizen>().SetNextFocusRightView(settingMainPanelButton);
+            settingMainPanelButton.On<Tizen>().SetNextFocusLeftView(appsMainPanelButton);
+            settingMainPanelButton.On<Tizen>().SetNextFocusRightView(settingMainPanelButton);
         }
 
         /// <summary>
@@ -206,24 +207,24 @@ namespace TVHome.Views
 
             if (recentSubPanelButtons.Count > 1)
             {
-                //recentMainPanelButton.On<Tizen>().SetNextFocusDownView(recentSubPanelButtons[0].FindByName<Button>("ButtonFocusArea"));
+                recentMainPanelButton.On<Tizen>().SetNextFocusDownView(recentSubPanelButtons[0].FindByName<Button>("ButtonFocusArea"));
             }
 
             foreach (var item in recentSubPanelButtons)
             {
-                //item.FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusUpView(recentMainPanelButton);
+                item.FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusUpView(recentMainPanelButton);
             }
 
             for (var i = 0; i < recentSubPanelButtons.Count; i++)
             {
                 if (i != 0)
                 {
-                    //recentSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusLeftView(recentSubPanelButtons[i - 1].FindByName<Button>("ButtonFocusArea"));
+                    recentSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusLeftView(recentSubPanelButtons[i - 1].FindByName<Button>("ButtonFocusArea"));
                 }
 
                 if (i != recentSubPanelButtons.Count - 1)
                 {
-                    //recentSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusRightView(recentSubPanelButtons[i + 1].FindByName<Button>("ButtonFocusArea"));
+                    recentSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusRightView(recentSubPanelButtons[i + 1].FindByName<Button>("ButtonFocusArea"));
                 }
             }
         }
@@ -239,24 +240,24 @@ namespace TVHome.Views
 
             if (appsSubPanelButtons.Count > 2)
             {
-                //appsMainPanelButton.On<Tizen>().SetNextFocusDownView(appsSubPanelButtons[1].FindByName<Button>("ButtonFocusArea"));
+                appsMainPanelButton.On<Tizen>().SetNextFocusDownView(appsSubPanelButtons[1].FindByName<Button>("ButtonFocusArea"));
             }
 
             foreach (var item in appsSubPanelButtons)
             {
-                //item.FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusUpView(appsMainPanelButton);
+                item.FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusUpView(appsMainPanelButton);
             }
 
             for (var i = 0; i < appsSubPanelButtons.Count; i++)
             {
                 if (i != 0)
                 {
-                    //appsSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusLeftView(appsSubPanelButtons[i - 1].FindByName<Button>("ButtonFocusArea"));
+                    appsSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusLeftView(appsSubPanelButtons[i - 1].FindByName<Button>("ButtonFocusArea"));
                 }
 
                 if (i != appsSubPanelButtons.Count - 1)
                 {
-                    //appsSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusRightView(appsSubPanelButtons[i + 1].FindByName<Button>("ButtonFocusArea"));
+                    appsSubPanelButtons[i].FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusRightView(appsSubPanelButtons[i + 1].FindByName<Button>("ButtonFocusArea"));
                 }
             }
         }
@@ -271,12 +272,12 @@ namespace TVHome.Views
 
             if (settingSubPanelButtons.Count > 2)
             {
-                //settingMainPanelButton.On<Tizen>().SetNextFocusDownView(settingSubPanelButtons[1].FindByName<Button>("ButtonFocusArea"));
+                settingMainPanelButton.On<Tizen>().SetNextFocusDownView(settingSubPanelButtons[1].FindByName<Button>("ButtonFocusArea"));
             }
 
             foreach (var item in settingSubPanelButtons)
             {
-                //item.FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusUpView(settingMainPanelButton);
+                item.FindByName<Button>("ButtonFocusArea").On<Tizen>().SetNextFocusUpView(settingMainPanelButton);
             }
         }
 
@@ -290,6 +291,7 @@ namespace TVHome.Views
             DebuggingUtils.Dbg("MainPage_PropertyChanged, status = " + CurrentState + ", - " + e.PropertyName);
             if (e.PropertyName.CompareTo("CurrentState") == 0)
             {
+                DebuggingUtils.Dbg("MyTest" + CurrentState);
                 switch (CurrentState)
                 {
                     case AppState.HomeIconified:
diff --git a/TVHome/TVHome/Views/SubThumbnailPanel.xaml.cs b/TVHome/TVHome/Views/SubThumbnailPanel.xaml.cs
index 8b5930d..521d2ab 100755
--- a/TVHome/TVHome/Views/SubThumbnailPanel.xaml.cs
+++ b/TVHome/TVHome/Views/SubThumbnailPanel.xaml.cs
@@ -25,6 +25,7 @@ using System.Collections.Generic;
 namespace TVHome.Views
 {
     using TVHome.ViewModels;
+    using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
     using Tizen = Xamarin.Forms.PlatformConfiguration.Tizen;
     /// <summary>
     /// SubThumnailPanel in Main Page for Recent
@@ -69,7 +70,7 @@ namespace TVHome.Views
             SetPanelDisplay();
 
             PropertyChanged += OnPropertyChanged;
-            //NoContentInfoText.On<Tizen>().SetFontWeight(FontWeight.Light);
+            NoContentInfoText.On<Tizen>().SetFontWeight(FontWeight.Light);
 
             ButtonList = new List<PanelButton>();
         }