Merge cherrypicks of ['googleplex-android-review.googlesource.com/22750962'] into tm-qpr3-release. (3336f0f9) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1170,6 +1170,11 @@ public class QuickstepLauncher extends Launcher {
		}
		}

		@Override
		public void tryClearAccessibilityFocus(View view) {
		view.clearAccessibilityFocus();
		}

		@Override
		protected void onSaveInstanceState(Bundle outState) {
		super.onSaveInstanceState(outState);

+7 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.content.Intent;
		import android.content.res.Configuration;
		import android.os.Bundle;
		import android.util.Log;
		import android.view.View;
		import android.window.OnBackInvokedDispatcher;

		import androidx.annotation.IntDef;
		@@ -362,6 +363,12 @@ public abstract class BaseActivity extends Activity implements ActivityContext {
		return (mForceInvisible & mask) != 0;
		}

		/**
		* Attempts to clear accessibility focus on {@param view}.
		*/
		public void tryClearAccessibilityFocus(View view) {
		}

		public interface MultiWindowModeChangedListener {
		void onMultiWindowModeChanged(boolean isInMultiWindowMode);
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -238,6 +238,7 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext>
		deepShortcutCount,
		popupDataProvider.getNotificationKeysForItem(item),
		systemShortcuts);
		launcher.tryClearAccessibilityFocus(icon);
		}
		launcher.refreshAndBindWidgetsForPackageUser(PackageUserKey.fromItemInfo(item));
		container.requestFocus();