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

Revert "Update FocusFinder"

Browse Source 
Revert submission 11830696-b/158492287-stage-aosp-rvc-ts-dev

Reason for revert: It's too late to merge this CL to rvc-dev. Let's revert it and merge it to rvc-qpr-dev.
Reverted Changes:
Ib5c1854d1:Update FocusFinder

Change-Id: I5f50166322b662b457e1b79b2ce62c622ddd1013
This commit is contained in:
Yabin Huang
2020-07-23 17:39:45 +00:00
parent 713af5fdd3
commit 6c01bf5f87
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,9 +311,6 @@ public class FocusFinder {
} }
final int count = focusables.size(); final int count = focusables.size();
if (count < 2) {
return null;
}
switch (direction) { switch (direction) {
case View.FOCUS_FORWARD: case View.FOCUS_FORWARD:
return getNextFocusable(focused, focusables, count); return getNextFocusable(focused, focusables, count);
@@ -376,29 +373,29 @@ public class FocusFinder {
} }
private static View getNextFocusable(View focused, ArrayList<View> focusables, int count) { private static View getNextFocusable(View focused, ArrayList<View> focusables, int count) {
if (count < 2) {
return null;
}
if (focused != null) { if (focused != null) {
int position = focusables.lastIndexOf(focused); int position = focusables.lastIndexOf(focused);
if (position >= 0 && position + 1 < count) { if (position >= 0 && position + 1 < count) {
return focusables.get(position + 1); return focusables.get(position + 1);
} }
} }
return focusables.get(0); if (!focusables.isEmpty()) {
return focusables.get(0);
}
return null;
} }
private static View getPreviousFocusable(View focused, ArrayList<View> focusables, int count) { private static View getPreviousFocusable(View focused, ArrayList<View> focusables, int count) {
if (count < 2) {
return null;
}
if (focused != null) { if (focused != null) {
int position = focusables.indexOf(focused); int position = focusables.indexOf(focused);
if (position > 0) { if (position > 0) {
return focusables.get(position - 1); return focusables.get(position - 1);
} }
} }
return focusables.get(count - 1); if (!focusables.isEmpty()) {
return focusables.get(count - 1);
}
return null;
} }
private static View getNextKeyboardNavigationCluster( private static View getNextKeyboardNavigationCluster(