diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index 243ed5c2ee..0a72f3682d 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -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); diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index 855983fdad..05a6452d2e 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -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); } diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index 3f75eccea0..1bd329e5d4 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -238,6 +238,7 @@ public class PopupContainerWithArrow deepShortcutCount, popupDataProvider.getNotificationKeysForItem(item), systemShortcuts); + launcher.tryClearAccessibilityFocus(icon); } launcher.refreshAndBindWidgetsForPackageUser(PackageUserKey.fromItemInfo(item)); container.requestFocus();