Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16b53c67 authored by Yigit Boyar's avatar Yigit Boyar Committed by android-build-merger
Browse files

Merge "Respect add focusables flags" into nyc-dev 

am: 4c6eeb67

* commit '4c6eeb67':
  Respect add focusables flags

Change-Id: I63af32dd31750d8af612a4c562ec1e1930129151
parents 2ee6a1a9 4c6eeb67

core/java/android/view/View.java

+2 −2
Original line number Diff line number Diff line
@@ -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);