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

Merge "Fix focus ordering with duplicate ids" into oc-dev

Browse Source 
am: a0ce440d60

Change-Id: I05050c7d2078a21f86a096ebc65bc2d6d8b4aa6a
This commit is contained in:
Evan Rosky
2017-04-13 00:06:42 +00:00
committed by android-build-merger
parent 4d56a0019a a0ce440d60
commit 33f6bcb71d
1 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,7 @@ import android.annotation.Nullable;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Rect; import android.graphics.Rect;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.SparseArray; import android.util.ArraySet;
import android.util.SparseBooleanArray;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -54,9 +53,11 @@ public class FocusFinder {
final Rect mOtherRect = new Rect(); final Rect mOtherRect = new Rect();
final Rect mBestCandidateRect = new Rect(); final Rect mBestCandidateRect = new Rect();
private final UserSpecifiedFocusComparator mUserSpecifiedFocusComparator = private final UserSpecifiedFocusComparator mUserSpecifiedFocusComparator =
new UserSpecifiedFocusComparator((v) -> v.getNextFocusForwardId()); new UserSpecifiedFocusComparator((r, v) -> isValidId(v.getNextFocusForwardId())
? v.findUserSetNextFocus(r, View.FOCUS_FORWARD) : null);
private final UserSpecifiedFocusComparator mUserSpecifiedClusterComparator = private final UserSpecifiedFocusComparator mUserSpecifiedClusterComparator =
new UserSpecifiedFocusComparator((v) -> v.getNextClusterForwardId()); new UserSpecifiedFocusComparator((r, v) -> isValidId(v.getNextClusterForwardId())
? v.findUserSetNextKeyboardNavigationCluster(r, View.FOCUS_FORWARD) : null);
private final FocusComparator mFocusComparator = new FocusComparator(); private final FocusComparator mFocusComparator = new FocusComparator();
private final ArrayList<View> mTempList = new ArrayList<View>(); private final ArrayList<View> mTempList = new ArrayList<View>();
@@ -258,7 +259,7 @@ public class FocusFinder {
@View.FocusDirection int direction) { @View.FocusDirection int direction) {
try { try {
// Note: This sort is stable. // Note: This sort is stable.
mUserSpecifiedClusterComparator.setFocusables(clusters); mUserSpecifiedClusterComparator.setFocusables(clusters, root);
Collections.sort(clusters, mUserSpecifiedClusterComparator); Collections.sort(clusters, mUserSpecifiedClusterComparator);
} finally { } finally {
mUserSpecifiedClusterComparator.recycle(); mUserSpecifiedClusterComparator.recycle();
@@ -283,7 +284,7 @@ public class FocusFinder {
View focused, Rect focusedRect, int direction) { View focused, Rect focusedRect, int direction) {
try { try {
// Note: This sort is stable. // Note: This sort is stable.
mUserSpecifiedFocusComparator.setFocusables(focusables); mUserSpecifiedFocusComparator.setFocusables(focusables, root);
Collections.sort(focusables, mUserSpecifiedFocusComparator); Collections.sort(focusables, mUserSpecifiedFocusComparator);
} finally { } finally {
mUserSpecifiedFocusComparator.recycle(); mUserSpecifiedFocusComparator.recycle();
@@ -823,56 +824,55 @@ public class FocusFinder {
* specified focus chains (eg. no nextFocusForward attributes defined), this should be a no-op. * specified focus chains (eg. no nextFocusForward attributes defined), this should be a no-op.
*/ */
private static final class UserSpecifiedFocusComparator implements Comparator<View> { private static final class UserSpecifiedFocusComparator implements Comparator<View> {
private final SparseArray<View> mFocusables = new SparseArray<View>(); private final ArrayMap<View, View> mNextFoci = new ArrayMap<>();
private final SparseBooleanArray mIsConnectedTo = new SparseBooleanArray(); private final ArraySet<View> mIsConnectedTo = new ArraySet<>();
private final ArrayMap<View, View> mHeadsOfChains = new ArrayMap<View, View>(); private final ArrayMap<View, View> mHeadsOfChains = new ArrayMap<View, View>();
private final ArrayMap<View, Integer> mOriginalOrdinal = new ArrayMap<>(); private final ArrayMap<View, Integer> mOriginalOrdinal = new ArrayMap<>();
private final NextIdGetter mNextIdGetter; private final NextFocusGetter mNextFocusGetter;
private View mRoot;
public interface NextIdGetter { public interface NextFocusGetter {
int get(View view); View get(View root, View view);
} }
UserSpecifiedFocusComparator(NextIdGetter nextIdGetter) { UserSpecifiedFocusComparator(NextFocusGetter nextFocusGetter) {
mNextIdGetter = nextIdGetter; mNextFocusGetter = nextFocusGetter;
} }
public void recycle() { public void recycle() {
mFocusables.clear(); mRoot = null;
mHeadsOfChains.clear(); mHeadsOfChains.clear();
mIsConnectedTo.clear(); mIsConnectedTo.clear();
mOriginalOrdinal.clear(); mOriginalOrdinal.clear();
mNextFoci.clear();
} }
public void setFocusables(List<View> focusables) { public void setFocusables(List<View> focusables, View root) {
for (int i = focusables.size() - 1; i >= 0; i--) { mRoot = root;
final View view = focusables.get(i);
final int id = view.getId();
if (isValidId(id)) {
mFocusables.put(id, view);
}
final int nextId = mNextIdGetter.get(view);
if (isValidId(nextId)) {
mIsConnectedTo.put(nextId, true);
}
}
for (int i = focusables.size() - 1; i >= 0; i--) {
final View view = focusables.get(i);
final int nextId = mNextIdGetter.get(view);
if (isValidId(nextId) && !mIsConnectedTo.get(view.getId())) {
setHeadOfChain(view);
}
}
for (int i = 0; i < focusables.size(); ++i) { for (int i = 0; i < focusables.size(); ++i) {
mOriginalOrdinal.put(focusables.get(i), i); mOriginalOrdinal.put(focusables.get(i), i);
} }
for (int i = focusables.size() - 1; i >= 0; i--) {
final View view = focusables.get(i);
final View next = mNextFocusGetter.get(mRoot, view);
if (next != null && mOriginalOrdinal.containsKey(next)) {
mNextFoci.put(view, next);
mIsConnectedTo.add(next);
}
}
for (int i = focusables.size() - 1; i >= 0; i--) {
final View view = focusables.get(i);
final View next = mNextFoci.get(view);
if (next != null && !mIsConnectedTo.contains(view)) {
setHeadOfChain(view);
}
}
} }
private void setHeadOfChain(View head) { private void setHeadOfChain(View head) {
for (View view = head; view != null; for (View view = head; view != null; view = mNextFoci.get(view)) {
view = mFocusables.get(mNextIdGetter.get(view))) {
final View otherHead = mHeadsOfChains.get(view); final View otherHead = mHeadsOfChains.get(view);
if (otherHead != null) { if (otherHead != null) {
if (otherHead == head) { if (otherHead == head) {
@@ -900,7 +900,7 @@ public class FocusFinder {
return -1; // first is the head, it should be first return -1; // first is the head, it should be first
} else if (second == firstHead) { } else if (second == firstHead) {
return 1; // second is the head, it should be first return 1; // second is the head, it should be first
} else if (isValidId(mNextIdGetter.get(first))) { } else if (mNextFoci.get(first) != null) {
return -1; // first is not the end of the chain return -1; // first is not the end of the chain
} else { } else {
return 1; // first is end of chain return 1; // first is end of chain