diff options
| -rw-r--r-- | core/java/android/view/View.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 4e7d19143385..77884f6e4d77 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -8740,7 +8740,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @param direction The direction of the focus */ public void addFocusables(ArrayList<View> views, @FocusDirection int direction) { - addFocusables(views, direction, FOCUSABLES_TOUCH_MODE); + addFocusables(views, direction, isInTouchMode() ? FOCUSABLES_TOUCH_MODE : FOCUSABLES_ALL); } /** @@ -8768,7 +8768,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, return; } if ((focusableMode & FOCUSABLES_TOUCH_MODE) == FOCUSABLES_TOUCH_MODE - && isInTouchMode() && !isFocusableInTouchMode()) { + && !isFocusableInTouchMode()) { return; } views.add(this); |