Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master

Bug: 79597307
Change-Id: I2aed66909831766ab308bfe4dd32f310d533c05a

1 files changed, 9 insertions, 8 deletions

diff --git a/src/com/android/tv/guide/TimelineGridView.java b/src/com/android/tv/guide/TimelineGridView.java
index 8af1c8a3..c4922b75 100644
--- a/src/com/android/tv/guide/TimelineGridView.java
+++ b/src/com/android/tv/guide/TimelineGridView.java
@@ -34,14 +34,15 @@ public class TimelineGridView extends RecyclerView {
     public TimelineGridView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
 
-        setLayoutManager(new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false) {
-            @Override
-            public boolean onRequestChildFocus(RecyclerView parent, State state, View child,
-                    View focused) {
-                 // This disables the default scroll behavior for focus movement.
-                return true;
-            }
-        });
+        setLayoutManager(
+                new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false) {
+                    @Override
+                    public boolean onRequestChildFocus(
+                            RecyclerView parent, State state, View child, View focused) {
+                        // This disables the default scroll behavior for focus movement.
+                        return true;
+                    }
+                });
 
         // RecyclerView is always focusable, however this is not desirable for us, so disable.
         // See b/18863217 (ag/634046) for reasons to why RecyclerView is focusable.