Merge "Fix Autofill PartitionedActivityTest fail." (e3e53162) · Commits · e / os / android_frameworks_base

core/java/android/view/AccessibilityInteractionController.java

+6 −8

Original line number	Original line	Diff line number	Diff line
	@@ -336,7 +336,7 @@ public final class AccessibilityInteractionController {
	}		}
	mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = flags;		mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = flags;
	final View root = findViewByAccessibilityId(accessibilityViewId);		final View root = findViewByAccessibilityId(accessibilityViewId);
	if (root != null) {		if (root != null && isShown(root)) {
	mPrefetcher.prefetchAccessibilityNodeInfos(		mPrefetcher.prefetchAccessibilityNodeInfos(
	root, virtualDescendantId, flags, infos, arguments);		root, virtualDescendantId, flags, infos, arguments);
	}		}
	@@ -448,7 +448,7 @@ public final class AccessibilityInteractionController {
	}		}
	mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = flags;		mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = flags;
	final View root = findViewByAccessibilityId(accessibilityViewId);		final View root = findViewByAccessibilityId(accessibilityViewId);
	if (root != null) {		if (root != null && isShown(root)) {
	AccessibilityNodeProvider provider = root.getAccessibilityNodeProvider();		AccessibilityNodeProvider provider = root.getAccessibilityNodeProvider();
	if (provider != null) {		if (provider != null) {
	infos = provider.findAccessibilityNodeInfosByText(text,		infos = provider.findAccessibilityNodeInfosByText(text,
	@@ -531,7 +531,7 @@ public final class AccessibilityInteractionController {
	}		}
	mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = flags;		mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = flags;
	final View root = findViewByAccessibilityId(accessibilityViewId);		final View root = findViewByAccessibilityId(accessibilityViewId);
	if (root != null) {		if (root != null && isShown(root)) {
	switch (focusType) {		switch (focusType) {
	case AccessibilityNodeInfo.FOCUS_ACCESSIBILITY: {		case AccessibilityNodeInfo.FOCUS_ACCESSIBILITY: {
	View host = mViewRootImpl.mAccessibilityFocusedHost;		View host = mViewRootImpl.mAccessibilityFocusedHost;
	@@ -621,7 +621,7 @@ public final class AccessibilityInteractionController {
	}		}
	mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = flags;		mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = flags;
	final View root = findViewByAccessibilityId(accessibilityViewId);		final View root = findViewByAccessibilityId(accessibilityViewId);
	if (root != null) {		if (root != null && isShown(root)) {
	View nextView = root.focusSearch(direction);		View nextView = root.focusSearch(direction);
	if (nextView != null) {		if (nextView != null) {
	next = nextView.createAccessibilityNodeInfo();		next = nextView.createAccessibilityNodeInfo();
	@@ -676,7 +676,7 @@ public final class AccessibilityInteractionController {
	}		}
	mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = flags;		mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = flags;
	final View target = findViewByAccessibilityId(accessibilityViewId);		final View target = findViewByAccessibilityId(accessibilityViewId);
	if (target != null) {		if (target != null && isShown(target)) {
	if (action == R.id.accessibilityActionClickOnClickableSpan) {		if (action == R.id.accessibilityActionClickOnClickableSpan) {
	// Handle this hidden action separately		// Handle this hidden action separately
	succeeded = handleClickableSpanActionUiThread(		succeeded = handleClickableSpanActionUiThread(
	@@ -759,9 +759,7 @@ public final class AccessibilityInteractionController {
	if (accessibilityId == AccessibilityNodeInfo.ROOT_ITEM_ID) {		if (accessibilityId == AccessibilityNodeInfo.ROOT_ITEM_ID) {
	return mViewRootImpl.mView;		return mViewRootImpl.mView;
	} else {		} else {
	final View foundView =		return AccessibilityNodeIdManager.getInstance().findView(accessibilityId);
	AccessibilityNodeIdManager.getInstance().findView(accessibilityId);
	return isShown(foundView) ? foundView : null;
	}		}
	}		}