Merge "recreate a11y focused virtual node when findFocus" (f29de4df) · Commits · e / os / android_frameworks_base

core/java/android/view/AccessibilityInteractionController.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -616,9 +616,12 @@ public final class AccessibilityInteractionController {
		// focus instead fetching all provider nodes to do the search here.
		AccessibilityNodeProvider provider = host.getAccessibilityNodeProvider();
		if (provider != null) {
		if (mViewRootImpl.mAccessibilityFocusedVirtualView != null) {
		focused = AccessibilityNodeInfo.obtain(
		mViewRootImpl.mAccessibilityFocusedVirtualView);
		final AccessibilityNodeInfo focusNode =
		mViewRootImpl.mAccessibilityFocusedVirtualView;
		if (focusNode != null) {
		final int virtualNodeId = AccessibilityNodeInfo
		.getVirtualDescendantId(focusNode.getSourceNodeId());
		focused = provider.createAccessibilityNodeInfo(virtualNodeId);
		}
		} else if (virtualDescendantId == AccessibilityNodeProvider.HOST_VIEW_ID) {
		focused = host.createAccessibilityNodeInfo();

+5 −0

Original line number	Diff line number	Diff line
		@@ -403,6 +403,8 @@ public final class ViewRootImpl implements ViewParent,
		View mView;

		View mAccessibilityFocusedHost;
		// Accessibility-focused virtual view. The bounds and sourceNodeId of
		// mAccessibilityFocusedVirtualView is up-to-date while other fields may be stale.
		AccessibilityNodeInfo mAccessibilityFocusedVirtualView;

		// True if the window currently has pointer capture enabled.
		@@ -4828,6 +4830,9 @@ public final class ViewRootImpl implements ViewParent,
		}

		/**
		* Get accessibility-focused virtual view. The bounds and sourceNodeId of the returned node is
		* up-to-date while other fields may be stale.
		*
		* @hide
		*/
		@UnsupportedAppUsage