Merge "Remove explicit a11y focus request" into main (ca34fb59) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserActivity.java

+2 −23

Original line number	Diff line number	Diff line
		@@ -24,7 +24,9 @@ import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CROS
		import static android.content.ContentProvider.getUserIdFromUri;
		import static android.stats.devicepolicy.DevicePolicyEnums.RESOLVER_EMPTY_STATE_NO_SHARING_TO_PERSONAL;
		import static android.stats.devicepolicy.DevicePolicyEnums.RESOLVER_EMPTY_STATE_NO_SHARING_TO_WORK;

		import static com.android.internal.util.LatencyTracker.ACTION_LOAD_SHARE_SHEET;

		import static java.lang.annotation.RetentionPolicy.SOURCE;

		import android.animation.Animator;
		@@ -2868,7 +2870,6 @@ public class ChooserActivity extends ResolverActivity implements
		@Override
		public void onListRebuilt(ResolverListAdapter listAdapter, boolean rebuildComplete) {
		setupScrollListener();
		maybeSetupGlobalLayoutListener();

		ChooserListAdapter chooserListAdapter = (ChooserListAdapter) listAdapter;
		if (chooserListAdapter.getUserHandle()
		@@ -2970,28 +2971,6 @@ public class ChooserActivity extends ResolverActivity implements
		});
		}

		private void maybeSetupGlobalLayoutListener() {
		if (shouldShowTabs()) {
		return;
		}
		final View recyclerView = mChooserMultiProfilePagerAdapter.getActiveAdapterView();
		recyclerView.getViewTreeObserver()
		.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
		@Override
		public void onGlobalLayout() {
		// Fixes an issue were the accessibility border disappears on list creation.
		recyclerView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
		final TextView titleView = findViewById(R.id.title);
		if (titleView != null) {
		titleView.setFocusable(true);
		titleView.setFocusableInTouchMode(true);
		titleView.requestFocus();
		titleView.requestAccessibilityFocus();
		}
		}
		});
		}

		@Override // ChooserListCommunicator
		public boolean isSendAction(Intent targetIntent) {
		if (targetIntent == null) {