Merge "Fixed default-cluster and empty-cluster navigation behavior" (1228e2cb) · Commits · e / os / android_frameworks_base

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -45167,6 +45167,8 @@ package android.view {
		method public static int resolveSize(int, int);
		method public static int resolveSizeAndState(int, int, int);
		method public boolean restoreDefaultFocus();
		method public boolean restoreFocusInCluster(int);
		method public boolean restoreFocusNotInCluster();
		method public void restoreHierarchyState(android.util.SparseArray<android.os.Parcelable>);
		method public void saveHierarchyState(android.util.SparseArray<android.os.Parcelable>);
		method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);

core/java/android/view/View.java

+18 −2

Original line number	Diff line number	Diff line
		@@ -9494,7 +9494,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		public void addKeyboardNavigationClusters(
		@NonNull Collection<View> views,
		int direction) {
		if (!(isKeyboardNavigationCluster())) {
		if (!isKeyboardNavigationCluster()) {
		return;
		}
		if (!hasFocusable()) {
		return;
		}
		views.add(this);
		@@ -9701,11 +9704,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		/**
		* Public for testing. This will request focus for whichever View was last focused within this
		* This will request focus for whichever View was last focused within this
		* cluster before a focus-jump out of it.
		*
		* @hide
		*/
		@TestApi
		public boolean restoreFocusInCluster(@FocusRealDirection int direction) {
		// Prioritize focusableByDefault over algorithmic focus selection.
		if (restoreDefaultFocus()) {
		@@ -9714,6 +9718,18 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		return requestFocus(direction);
		}

		/**
		* This will request focus for whichever View not in a cluster was last focused before a
		* focus-jump to a cluster. If no non-cluster View has previously had focus, this will focus
		* the "first" focusable view it finds.
		*
		* @hide
		*/
		@TestApi
		public boolean restoreFocusNotInCluster() {
		return requestFocus(View.FOCUS_DOWN);
		}

		/**
		* Gives focus to the default-focus view in the view hierarchy that has this view as a root.
		* If the default-focus view cannot be found, falls back to calling {@link #requestFocus(int)}.

core/java/android/view/ViewGroup.java

+36 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.animation.LayoutTransition;
		import android.annotation.CallSuper;
		import android.annotation.IdRes;
		import android.annotation.NonNull;
		import android.annotation.TestApi;
		import android.annotation.UiThread;
		import android.content.ClipData;
		import android.content.Context;
		@@ -3166,6 +3167,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		/**
		* @hide
		*/
		@TestApi
		@Override
		public boolean restoreFocusInCluster(@FocusRealDirection int direction) {
		if (mFocusedInCluster != null && !mFocusedInCluster.isKeyboardNavigationCluster()
		@@ -3177,6 +3179,40 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		return super.restoreFocusInCluster(direction);
		}

		/**
		* @hide
		*/
		@Override
		public boolean restoreFocusNotInCluster() {
		if (mFocusedInCluster != null) {
		// since clusters don't nest; we can assume that a non-null mFocusedInCluster
		// will refer to a view not-in a cluster.
		return restoreFocusInCluster(View.FOCUS_DOWN);
		}
		if (isKeyboardNavigationCluster()) {
		return false;
		}
		int descendentFocusability = getDescendantFocusability();
		if (descendentFocusability == FOCUS_BLOCK_DESCENDANTS) {
		return super.requestFocus(FOCUS_DOWN, null);
		}
		if (descendentFocusability == FOCUS_BEFORE_DESCENDANTS
		&& super.requestFocus(FOCUS_DOWN, null)) {
		return true;
		}
		for (int i = 0; i < mChildrenCount; ++i) {
		View child = mChildren[i];
		if (!child.isKeyboardNavigationCluster()
		&& child.restoreFocusNotInCluster()) {
		return true;
		}
		}
		if (descendentFocusability == FOCUS_AFTER_DESCENDANTS) {
		return super.requestFocus(FOCUS_DOWN, null);
		}
		return false;
		}

		/**
		* {@inheritDoc}
		*

core/java/android/view/ViewRootImpl.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -4465,7 +4465,7 @@ public final class ViewRootImpl implements ViewParent,

		private boolean performKeyboardGroupNavigation(int direction) {
		final View focused = mView.findFocus();
		final View cluster = focused != null
		View cluster = focused != null
		? focused.keyboardNavigationClusterSearch(null, direction)
		: keyboardNavigationClusterSearch(null, direction);

		@@ -4476,6 +4476,15 @@ public final class ViewRootImpl implements ViewParent,
		realDirection = View.FOCUS_DOWN;
		}

		if (cluster != null && cluster.isRootNamespace()) {
		// the default cluster. Try to find a non-clustered view to focus.
		if (cluster.restoreFocusNotInCluster()) {
		return true;
		}
		// otherwise skip to next actual cluster
		cluster = keyboardNavigationClusterSearch(null, direction);
		}

		if (cluster != null && cluster.restoreFocusInCluster(realDirection)) {
		return true;
		}