commit 6a85817dfca8e6dd2333207ca9339c84857800ea
author Jon Miranda <jonmiranda@google.com> Tue Oct 25 16:19:17 2016 -0700
committer Jon Miranda <jonmiranda@google.com> Thu Oct 27 14:14:31 2016 -0700
tree 85bac66ac1450898baa9413babab52145d47d700
parent 9ccafbff26f5835ab9725d876d1bf7ccd08ccf84

Don't add focusables when getDescendantFocusability is FOCUS_BLOCK_DESCENDANTS.

Bug: 32315286
Change-Id: I6fc6600fc9cbf83f720d9e6e878735076cd52cf1

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 0abac36..ee7f9f8 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1068,6 +1068,10 @@
 
     @Override
     public void addFocusables(ArrayList<View> views, int direction, int focusableMode) {
+        if (getDescendantFocusability() == FOCUS_BLOCK_DESCENDANTS) {
+            return;
+        }
+
         // XXX-RTL: This will be fixed in a future CL
         if (mCurrentPage >= 0 && mCurrentPage < getPageCount()) {
             getPageAt(mCurrentPage).addFocusables(views, direction, focusableMode);