Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ab41346 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Clear Accessibility Focus from icon after Shorcut Menu invoked 2p: cb582591

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

Change-Id: Ib5981d226c7cabe8e302c108b198c3fb657f3812
parents ce06bca4 cb582591
Loading
Loading
Loading
Loading
+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();