Manual merge for nui v0.2.34

[platform/core/csapi/tizenfx.git] / NUISamples / NUISamples / NUISamples.TizenTV / firstscreen / ScrollContainer.cs

diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs
index 0164b9a..a5129f5 100755 (executable)
--- a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs
@@ -318,7 +318,7 @@ namespace FirstScreen
 
         // This override function supports two dimensional keyboard navigation.
         // This function returns the next keyboard focusable actor in ScrollContainer control towards the given direction.
-        public override View GetNextKeyboardFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled)
+        public override View GetNextFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled)
         {
             if (direction == View.FocusDirection.Left)
             {
@@ -334,7 +334,7 @@ namespace FirstScreen
             }
         }
         
-        public override void OnKeyboardFocusChangeCommitted(View commitedFocusableView)
+        public override void OnFocusChangeCommitted(View commitedFocusableView)
         {
             Focus(_focusedItem);
         }