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

Commit cb93ec5f authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Support second meta key closing the all apps tray

Bug: 270244718
Test: Tap meta key twice, see all apps tray open an close
Change-Id: I6db84aa16b7d21663053bf1b269af6ba36874e47
parent bc55b29c
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.view.MotionEvent.ACTION_POINTER_DOWN;
import static android.view.MotionEvent.ACTION_POINTER_UP;
import static android.view.MotionEvent.ACTION_UP;

import static com.android.launcher3.Launcher.INTENT_ACTION_ALL_APPS_TOGGLE;
import static com.android.launcher3.MotionEventsUtils.isTrackpadMultiFingerSwipe;
import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS;
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
@@ -514,7 +515,7 @@ public class TouchInteractionService extends Service

        if (isHomeAndOverviewSame) {
            Intent intent = new Intent(mOverviewComponentObserver.getHomeIntent())
                    .setAction(Intent.ACTION_ALL_APPS);
                    .setAction(INTENT_ACTION_ALL_APPS_TOGGLE);
            RemoteAction allAppsAction = new RemoteAction(
                    Icon.createWithResource(this, R.drawable.ic_apps),
                    getString(R.string.all_apps_label),
+13 −0
Original line number Diff line number Diff line
@@ -289,6 +289,9 @@ public class Launcher extends StatefulActivity<LauncherState>
    // Type PendingSplitSelectInfo<Parcelable>
    protected static final String PENDING_SPLIT_SELECT_INFO = "launcher.pending_split_select_info";

    public static final String INTENT_ACTION_ALL_APPS_TOGGLE =
            "launcher.intent_action_all_apps_toggle";

    public static final String ON_CREATE_EVT = "Launcher.onCreate";
    public static final String ON_START_EVT = "Launcher.onStart";
    public static final String ON_RESUME_EVT = "Launcher.onResume";
@@ -1692,6 +1695,8 @@ public class Launcher extends StatefulActivity<LauncherState>
            handleGestureContract(intent);
        } else if (Intent.ACTION_ALL_APPS.equals(intent.getAction())) {
            showAllAppsFromIntent(alreadyOnHome);
        } else if (INTENT_ACTION_ALL_APPS_TOGGLE.equals(intent.getAction())) {
            toggleAllAppsFromIntent(alreadyOnHome);
        } else if (Intent.ACTION_SHOW_WORK_APPS.equals(intent.getAction())) {
            showAllAppsWorkTabFromIntent(alreadyOnHome);
        }
@@ -1699,6 +1704,14 @@ public class Launcher extends StatefulActivity<LauncherState>
        TraceHelper.INSTANCE.endSection(traceToken);
    }

    protected void toggleAllAppsFromIntent(boolean alreadyOnHome) {
        if (getStateManager().isInStableState(ALL_APPS)) {
            getStateManager().goToState(NORMAL, alreadyOnHome);
        } else {
            showAllAppsFromIntent(alreadyOnHome);
        }
    }

    protected void showAllAppsFromIntent(boolean alreadyOnHome) {
        AbstractFloatingView.closeAllOpenViews(this);
        getStateManager().goToState(ALL_APPS, alreadyOnHome);