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

Merge "Don't focus search user-specified views which are invisible" into oc-dev

Browse Source 
am: 3b213ed438

Change-Id: I5a058c7024020e41ba8747c243d7209127cba19f
This commit is contained in:
Evan Rosky
2017-05-02 21:01:30 +00:00
committed by android-build-merger
parent 19ac164d1b 3b213ed438
commit 078728f100
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/view/FocusFinder.java
View File

@@ -193,10 +193,14 @@ public class FocusFinder {
private View findNextUserSpecifiedFocus(ViewGroup root, View focused, int direction) {
// check for user specified next focus
View userSetNextFocus = focused.findUserSetNextFocus(root, direction);
if (userSetNextFocus != null && userSetNextFocus.isFocusable()
&& (!userSetNextFocus.isInTouchMode()
|| userSetNextFocus.isFocusableInTouchMode())) {
return userSetNextFocus;
while (userSetNextFocus != null) {
if (userSetNextFocus.isFocusable()
&& userSetNextFocus.getVisibility() == View.VISIBLE
&& (!userSetNextFocus.isInTouchMode()
|| userSetNextFocus.isFocusableInTouchMode())) {
return userSetNextFocus;
}
userSetNextFocus = userSetNextFocus.findUserSetNextFocus(root, direction);
}
return null;
}