commit 8312d9981a045331a0e4ede278a2526918fee650
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 07 21:39:09 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 07 21:39:09 2016 +0000
tree 7312c78cfba9036d7b0e48faa60d2750b9fb1a5c
parent cf51b649a3127f38968d25cf9d7771622782bcf1
parent a6d291e599ce68740855b50e08d5cb9604b92256

Merge "Leanback: fix testSetSelectedPositionDetached"

v17/leanback/src/android/support/v17/leanback/widget/BaseGridView.java

diff --git a/v17/leanback/src/android/support/v17/leanback/widget/BaseGridView.java b/v17/leanback/src/android/support/v17/leanback/widget/BaseGridView.java
index 3602ff3..1288ed1 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/BaseGridView.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/BaseGridView.java
@@ -199,6 +199,8 @@
         super(context, attrs, defStyle);
         mLayoutManager = new GridLayoutManager(this);
         setLayoutManager(mLayoutManager);
+        // leanback LayoutManager already restores focus inside onLayoutChildren().
+        setPreserveFocusAfterLayout(false);
         setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
         setHasFixedSize(true);
         setChildrenDrawingOrderEnabled(true);