diff options
| author | Jonathan Miranda <jonmiranda@google.com> | 2016-10-28 00:25:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-28 00:25:11 +0000 |
| commit | 37e4df17cb37b275cb6c36f00809d790d2c98a98 (patch) | |
| tree | 53ccfe8971c56b66b9837258231fe5dbe5b862d2 /src/com/android/launcher3 | |
| parent | ed38a3c515a9e69ce566bea9aa0449a6d3583926 (diff) | |
| parent | 6a85817dfca8e6dd2333207ca9339c84857800ea (diff) | |
| download | android_packages_apps_Trebuchet-37e4df17cb37b275cb6c36f00809d790d2c98a98.tar.gz android_packages_apps_Trebuchet-37e4df17cb37b275cb6c36f00809d790d2c98a98.tar.bz2 android_packages_apps_Trebuchet-37e4df17cb37b275cb6c36f00809d790d2c98a98.zip | |
Merge "Don't add focusables when getDescendantFocusability is FOCUS_BLOCK_DESCENDANTS." into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 0abac3670..ee7f9f805 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1068,6 +1068,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc @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); |