[automerge] Clear Accessibility Focus from icon after Shorcut Menu invoked 2p: cb582591b3 am: 5ab41346d8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22750962

Change-Id: I16a861cfa872f928c5e4414a9f0ecdceacf1f325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -1178,6 +1178,11 @@ public class QuickstepLauncher extends Launcher {
         }
     }
 
+    @Override
+    public void tryClearAccessibilityFocus(View view) {
+        view.clearAccessibilityFocus();
+    }
+
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);

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);
     }

src/com/android/launcher3/popup/PopupContainerWithArrow.java

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