diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java index e80ad7a8a1..332eb9519e 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java @@ -185,10 +185,13 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba // Create a Stream of all applicable system shortcuts private Stream getSystemShortcuts() { - // append split options to APP_INFO shortcut, the order here will reflect in the popup + // append split options to APP_INFO shortcut if not in Desktop Windowing mode, the order + // here will reflect in the popup ArrayList shortcuts = new ArrayList<>(); shortcuts.add(APP_INFO); - shortcuts.addAll(mControllers.uiController.getSplitMenuOptions().toList()); + if (!mControllers.taskbarRecentAppsController.isInDesktopMode()) { + shortcuts.addAll(mControllers.uiController.getSplitMenuOptions().toList()); + } if (com.android.wm.shell.Flags.enableBubbleAnything()) { shortcuts.add(BUBBLE); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentAppsController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentAppsController.kt index 1a168a925b..737d03198e 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentAppsController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentAppsController.kt @@ -81,7 +81,7 @@ class TaskbarRecentAppsController( private val desktopVisibilityController: DesktopVisibilityController? get() = desktopVisibilityControllerProvider() - private val isInDesktopMode: Boolean + val isInDesktopMode: Boolean get() = desktopVisibilityController?.areDesktopTasksVisible() ?: false val runningTaskIds: Set