commit 37e4df17cb37b275cb6c36f00809d790d2c98a98
author Jonathan Miranda <jonmiranda@google.com> Fri Oct 28 00:25:11 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 28 00:25:11 2016 +0000
tree 53ccfe8971c56b66b9837258231fe5dbe5b862d2
parent ed38a3c515a9e69ce566bea9aa0449a6d3583926
parent 6a85817dfca8e6dd2333207ca9339c84857800ea

Merge "Don't add focusables when getDescendantFocusability is FOCUS_BLOCK_DESCENDANTS." into ub-launcher3-master

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);