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

Commit 4227a72c authored by Brian Isganitis's avatar Brian Isganitis Committed by Android (Google) Code Review
Browse files

Merge "Have meta key toggle Taskbar All Apps in freeform mode." into main

parents d842f5e5 588b78e1

quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java

+4 −2
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ import com.android.quickstep.util.AssistUtils; 
import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.unfold.UnfoldTransitionProgressProvider;

import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider;

import com.android.wm.shell.Flags;



import java.io.PrintWriter;

import java.util.StringJoiner;
@@ -329,7 +328,10 @@ public class TaskbarManager { 
            return;

        }



        if (mActivity != null && mActivity.isResumed() && !mActivity.isInState(OVERVIEW)) {

        if (mActivity != null

                && mActivity.isResumed()

                && !mActivity.isInState(OVERVIEW)

                && !(mActivity instanceof QuickstepLauncher l && l.areFreeformTasksVisible())) {

            mContext.startActivity(homeAllAppsIntent);

            return;

        }