Merge "Improve rect-level focus ordering" into oc-dev am: 197052d6cb (3efa8c8f) · Commits · e / os / android_frameworks_base

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -44347,6 +44347,7 @@ package android.view {
		method public android.view.View findNextFocusFromRect(android.view.ViewGroup, android.graphics.Rect, int);
		method public android.view.View findNextKeyboardNavigationCluster(android.view.View, android.view.View, int);
		method public static android.view.FocusFinder getInstance();
		method public static void sort(android.view.View[], int, int, android.view.ViewGroup, boolean);
		}

		public final class FrameMetrics {

core/java/android/view/FocusFinder.java

+86 −47

Original line number	Diff line number	Diff line
		@@ -18,14 +18,17 @@ package android.view;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.TestApi;
		import android.content.pm.PackageManager;
		import android.graphics.Rect;
		import android.util.ArrayMap;
		import android.util.ArraySet;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.Comparator;
		import java.util.HashMap;
		import java.util.List;

		/**
		@@ -58,7 +61,7 @@ public class FocusFinder {
		private final UserSpecifiedFocusComparator mUserSpecifiedClusterComparator =
		new UserSpecifiedFocusComparator((r, v) -> isValidId(v.getNextClusterForwardId())
		? v.findUserSetNextKeyboardNavigationCluster(r, View.FOCUS_FORWARD) : null);
		private final FocusComparator mFocusComparator = new FocusComparator();
		private final FocusSorter mFocusSorter = new FocusSorter();

		private final ArrayList<View> mTempList = new ArrayList<View>();

		@@ -760,63 +763,99 @@ public class FocusFinder {
		return id != 0 && id != View.NO_ID;
		}

		static FocusComparator getFocusComparator(ViewGroup root, boolean isRtl) {
		FocusComparator comparator = getInstance().mFocusComparator;
		comparator.setRoot(root);
		comparator.setIsLayoutRtl(isRtl);
		return comparator;
		}

		static final class FocusComparator implements Comparator<View> {
		private final Rect mFirstRect = new Rect();
		private final Rect mSecondRect = new Rect();
		private ViewGroup mRoot = null;
		private boolean mIsLayoutRtl;
		static final class FocusSorter {
		private ArrayList<Rect> mRectPool = new ArrayList<>();
		private int mLastPoolRect;
		private int mRtlMult;
		private HashMap<View, Rect> mRectByView = null;

		public void setIsLayoutRtl(boolean b) {
		mIsLayoutRtl = b;
		private Comparator<View> mTopsComparator = (first, second) -> {
		if (first == second) {
		return 0;
		}

		public void setRoot(ViewGroup root) {
		mRoot = root;
		Rect firstRect = mRectByView.get(first);
		Rect secondRect = mRectByView.get(second);

		int result = firstRect.top - secondRect.top;
		if (result == 0) {
		return firstRect.bottom - secondRect.bottom;
		}
		return result;
		};

		public int compare(View first, View second) {
		private Comparator<View> mSidesComparator = (first, second) -> {
		if (first == second) {
		return 0;
		}

		getRect(first, mFirstRect);
		getRect(second, mSecondRect);

		if (mFirstRect.top < mSecondRect.top) {
		return -1;
		} else if (mFirstRect.top > mSecondRect.top) {
		return 1;
		} else if (mFirstRect.left < mSecondRect.left) {
		return mIsLayoutRtl ? 1 : -1;
		} else if (mFirstRect.left > mSecondRect.left) {
		return mIsLayoutRtl ? -1 : 1;
		} else if (mFirstRect.bottom < mSecondRect.bottom) {
		return -1;
		} else if (mFirstRect.bottom > mSecondRect.bottom) {
		return 1;
		} else if (mFirstRect.right < mSecondRect.right) {
		return mIsLayoutRtl ? 1 : -1;
		} else if (mFirstRect.right > mSecondRect.right) {
		return mIsLayoutRtl ? -1 : 1;
		Rect firstRect = mRectByView.get(first);
		Rect secondRect = mRectByView.get(second);

		int result = firstRect.left - secondRect.left;
		if (result == 0) {
		return firstRect.right - secondRect.right;
		}
		return mRtlMult * result;
		};

		public void sort(View[] views, int start, int end, ViewGroup root, boolean isRtl) {
		int count = end - start;
		if (count < 2) {
		return;
		}
		if (mRectByView == null) {
		mRectByView = new HashMap<>();
		}
		mRtlMult = isRtl ? -1 : 1;
		for (int i = mRectPool.size(); i < count; ++i) {
		mRectPool.add(new Rect());
		}
		for (int i = start; i < end; ++i) {
		Rect next = mRectPool.get(mLastPoolRect++);
		views[i].getDrawingRect(next);
		root.offsetDescendantRectToMyCoords(views[i], next);
		mRectByView.put(views[i], next);
		}

		// Sort top-to-bottom
		Arrays.sort(views, start, count, mTopsComparator);
		// Sweep top-to-bottom to identify rows
		int sweepBottom = mRectByView.get(views[start]).bottom;
		int rowStart = start;
		int sweepIdx = start + 1;
		for (; sweepIdx < end; ++sweepIdx) {
		Rect currRect = mRectByView.get(views[sweepIdx]);
		if (currRect.top >= sweepBottom) {
		// Next view is on a new row, sort the row we've just finished left-to-right.
		if ((sweepIdx - rowStart) > 1) {
		Arrays.sort(views, rowStart, sweepIdx, mSidesComparator);
		}
		sweepBottom = currRect.bottom;
		rowStart = sweepIdx;
		} else {
		// The view are distinct but completely coincident so we consider
		// them equal for our purposes. Since the sort is stable, this
		// means that the views will retain their layout order relative to one another.
		return 0;
		// Next view vertically overlaps, we need to extend our "row height"
		sweepBottom = Math.max(sweepBottom, currRect.bottom);
		}
		}
		// Sort whatever's left (final row) left-to-right
		if ((sweepIdx - rowStart) > 1) {
		Arrays.sort(views, rowStart, sweepIdx, mSidesComparator);
		}

		private void getRect(View view, Rect rect) {
		view.getDrawingRect(rect);
		mRoot.offsetDescendantRectToMyCoords(view, rect);
		mLastPoolRect = 0;
		mRectByView.clear();
		}
		}

		/**
		* Public for testing.
		*
		* @hide
		*/
		@TestApi
		public static void sort(View[] views, int start, int end, ViewGroup root, boolean isRtl) {
		getInstance().mFocusSorter.sort(views, start, end, root, isRtl);
		}

		/**

core/java/android/view/ViewGroup.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -61,7 +61,6 @@ import android.view.animation.Transformation;
		import com.android.internal.R;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collection;
		import java.util.Collections;
		import java.util.HashSet;
		@@ -1216,7 +1215,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		children[count++] = child;
		}
		}
		Arrays.sort(children, 0, count, FocusFinder.getFocusComparator(this, false));
		FocusFinder.sort(children, 0, count, this, isLayoutRtl());
		for (int i = 0; i < count; ++i) {
		children[i].addFocusables(views, direction, focusableMode);
		}
		@@ -1266,7 +1265,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		visibleChildren[count++] = child;
		}
		}
		Arrays.sort(visibleChildren, 0, count, FocusFinder.getFocusComparator(this, false));
		FocusFinder.sort(visibleChildren, 0, count, this, isLayoutRtl());
		for (int i = 0; i < count; ++i) {
		visibleChildren[i].addKeyboardNavigationClusters(views, direction);
		}