Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Respect add focusables flags" into nyc-dev

Browse Source 
am: 4c6eeb67a2

* commit '4c6eeb67a232fdbca43513d8414e38a55c40d75e':
  Respect add focusables flags

Change-Id: I8bb85f17fa0d85ae9d58aa026711e298c1b0f09a
This commit is contained in:
Yigit Boyar
2016-05-12 23:27:19 +00:00
committed by android-build-merger
parent 0d3ff75c06 4c6eeb67a2
commit bd6f5fc3a0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/View.java
View File

@@ -8740,7 +8740,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @param direction The direction of the focus * @param direction The direction of the focus
*/ */
public void addFocusables(ArrayList<View> views, @FocusDirection int direction) { 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; return;
} }
if ((focusableMode & FOCUSABLES_TOUCH_MODE) == FOCUSABLES_TOUCH_MODE if ((focusableMode & FOCUSABLES_TOUCH_MODE) == FOCUSABLES_TOUCH_MODE
&& isInTouchMode() && !isFocusableInTouchMode()) { && !isFocusableInTouchMode()) {
return; return;
} }
views.add(this); views.add(this);