Merge "Fix talkback focus issue in share sheet" into rvc-dev am: b7f81189bd... (b1fb21dd) · Commits · e / os / android_frameworks_base

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

+24 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,7 @@ import android.view.View.MeasureSpec;
		import android.view.View.OnClickListener;
		import android.view.ViewGroup;
		import android.view.ViewGroup.LayoutParams;
		import android.view.ViewTreeObserver;
		import android.view.animation.AccelerateInterpolator;
		import android.view.animation.DecelerateInterpolator;
		import android.widget.Button;
		@@ -2777,6 +2778,7 @@ public class ChooserActivity extends ResolverActivity implements
		@Override
		public void onListRebuilt(ResolverListAdapter listAdapter) {
		setupScrollListener();
		maybeSetupGlobalLayoutListener();

		ChooserListAdapter chooserListAdapter = (ChooserListAdapter) listAdapter;
		if (chooserListAdapter.getUserHandle()
		@@ -2858,6 +2860,28 @@ 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) {