Merge "a11y: refine sequential focus starting point" into main (43485446) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -8023,6 +8023,11 @@ public final class ViewRootImpl implements ViewParent,
		}
		if (direction != 0) {
		View focused = mView.findFocus();
		if (a11ySequentialFocusStartingPoint()
		&& focused == null
		&& ViewRootImpl.this.mAccessibilityFocusedHost != null) {
		focused = ViewRootImpl.this.mAccessibilityFocusedHost;
		}
		if (focused != null) {
		mAttachInfo.mNextFocusLooped = false;
		View v = focused.focusSearch(direction);
		@@ -8062,11 +8067,6 @@ public final class ViewRootImpl implements ViewParent,
		return true;
		}
		} else {
		if (a11ySequentialFocusStartingPoint()
		&& ViewRootImpl.this.mAccessibilityFocusedHost != null) {
		ViewRootImpl.this.mAccessibilityFocusedHost.requestFocus(direction);
		return true;
		}
		if (mView.restoreDefaultFocus()) {
		return true;
		} else if (moveFocusToAdjacentWindow(direction)) {