Merge "Prefer launching desktop tasks on freeform display" into main

2025-04-02 16:54:41 -07:00
parent 243e95fd5f 1f4b265dde
commit 343333ce8a
6 changed files with 68 additions and 49 deletions
@@ -756,8 +756,9 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
    }

    private boolean shouldUpdateIconContentDescription(BubbleTextView btv) {
-        boolean isInDesktopMode = mControllers.taskbarDesktopModeController.isInDesktopMode(
-                DEFAULT_DISPLAY);
+        boolean isInDesktopMode =
+                mControllers.taskbarDesktopModeController.shouldShowDesktopTasksInTaskbar(
+                        DEFAULT_DISPLAY);
        boolean isAllAppsButton = btv instanceof TaskbarAllAppsButtonContainer;
        boolean isDividerButton = btv instanceof TaskbarDividerContainer;
        return isInDesktopMode && !isAllAppsButton && !isDividerButton;