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 am: 4c6eeb67a2

Browse Source 
am: bd6f5fc3a0

* commit 'bd6f5fc3a0ae408fe1a0a249025f6f2262c22aa7':
  Respect add focusables flags

Change-Id: Ic9cacc26ad9bb2036e2b9de4a325ecb423514648
This commit is contained in:
Yigit Boyar
2016-05-12 23:29:55 +00:00
committed by android-build-merger
parent 9923dd7ef0 bd6f5fc3a0
commit fc31986014
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
*/
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);