diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index 9fe92029e4..f6d0d8d4ad 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -85,7 +85,6 @@ import androidx.core.view.WindowInsetsCompat; import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.BubbleTextView; import com.android.launcher3.DeviceProfile; -import com.android.launcher3.Flags; import com.android.launcher3.LauncherPrefs; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.R; @@ -1345,7 +1344,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { mControllers.uiController.onTaskbarIconLaunched(api); mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true); } - } else if (tag instanceof TaskItemInfo info && !Flags.enableMultiInstanceMenuTaskbar()) { + } else if (tag instanceof TaskItemInfo info) { RemoteTransition remoteTransition = canUnminimizeDesktopTask(info.getTaskId()) ? createUnminimizeRemoteTransition() : null; @@ -1354,7 +1353,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext { taskView = recents.getTaskViewByTaskId(info.getTaskId()); } - if (areDesktopTasksVisible() && taskView != null) { + if (areDesktopTasksVisible() && taskView != null + && mControllers.uiController.isInOverviewUi()) { RunnableList runnableList = taskView.launchWithAnimation(); if (runnableList != null) { runnableList.add(() ->