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

Commit 7a8cbd31 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Support second meta key closing the all apps tray" into udc-dev

parents 6b543872 cb93ec5f

quickstep/src/com/android/quickstep/TouchInteractionService.java

+2 −1
Original line number Original line 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_POINTER_UP;

import static android.view.MotionEvent.ACTION_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.MotionEventsUtils.isTrackpadMultiFingerSwipe;

import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS;

import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
@@ -514,7 +515,7 @@ public class TouchInteractionService extends Service 




        if (isHomeAndOverviewSame) {

        if (isHomeAndOverviewSame) {

            Intent intent = new Intent(mOverviewComponentObserver.getHomeIntent())

            Intent intent = new Intent(mOverviewComponentObserver.getHomeIntent())

                    .setAction(Intent.ACTION_ALL_APPS);

                    .setAction(INTENT_ACTION_ALL_APPS_TOGGLE);

            RemoteAction allAppsAction = new RemoteAction(

            RemoteAction allAppsAction = new RemoteAction(

                    Icon.createWithResource(this, R.drawable.ic_apps),

                    Icon.createWithResource(this, R.drawable.ic_apps),

                    getString(R.string.all_apps_label),

                    getString(R.string.all_apps_label),

src/com/android/launcher3/Launcher.java

+13 −0
Original line number Original line Diff line number Diff line
@@ -288,6 +288,9 @@ public class Launcher extends StatefulActivity<LauncherState> 
    // Type PendingSplitSelectInfo<Parcelable>

    // Type PendingSplitSelectInfo<Parcelable>

    protected static final String PENDING_SPLIT_SELECT_INFO = "launcher.pending_split_select_info";

    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_CREATE_EVT = "Launcher.onCreate";

    public static final String ON_START_EVT = "Launcher.onStart";

    public static final String ON_START_EVT = "Launcher.onStart";

    public static final String ON_RESUME_EVT = "Launcher.onResume";

    public static final String ON_RESUME_EVT = "Launcher.onResume";
@@ -1687,6 +1690,8 @@ public class Launcher extends StatefulActivity<LauncherState> 
            handleGestureContract(intent);

            handleGestureContract(intent);

        } else if (Intent.ACTION_ALL_APPS.equals(intent.getAction())) {

        } else if (Intent.ACTION_ALL_APPS.equals(intent.getAction())) {

            showAllAppsFromIntent(alreadyOnHome);

            showAllAppsFromIntent(alreadyOnHome);

        } else if (INTENT_ACTION_ALL_APPS_TOGGLE.equals(intent.getAction())) {

            toggleAllAppsFromIntent(alreadyOnHome);

        } else if (Intent.ACTION_SHOW_WORK_APPS.equals(intent.getAction())) {

        } else if (Intent.ACTION_SHOW_WORK_APPS.equals(intent.getAction())) {

            showAllAppsWorkTabFromIntent(alreadyOnHome);

            showAllAppsWorkTabFromIntent(alreadyOnHome);

        }

        }
@@ -1694,6 +1699,14 @@ public class Launcher extends StatefulActivity<LauncherState> 
        TraceHelper.INSTANCE.endSection(traceToken);

        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) {

    protected void showAllAppsFromIntent(boolean alreadyOnHome) {

        AbstractFloatingView.closeAllOpenViews(this);

        AbstractFloatingView.closeAllOpenViews(this);

        getStateManager().goToState(ALL_APPS, alreadyOnHome);

        getStateManager().goToState(ALL_APPS, alreadyOnHome);