Merge "Add deskId to DesktopTask." into main

2025-02-21 18:33:52 -08:00
parent 467ab548d9 dafc2d4c42
commit 63de256dfe
9 changed files with 62 additions and 24 deletions
@@ -3048,8 +3048,12 @@ public abstract class RecentsView<
            // Add an empty view for now until the task plan is loaded and applied
            final TaskView taskView;
            if (needDesktopTask) {
+                final int activeDeskId =
+                        DesktopVisibilityController.INSTANCE.get(mContext).getActiveDeskId(
+                                mContainer.getDisplay().getDisplayId());
                taskView = getTaskViewFromPool(TaskViewType.DESKTOP);
-                ((DesktopTaskView) taskView).bind(new DesktopTask(Arrays.asList(runningTasks)),
+                ((DesktopTaskView) taskView).bind(
+                        new DesktopTask(activeDeskId, Arrays.asList(runningTasks)),
                        mOrientationState, mTaskOverlayFactory);
            } else if (needGroupTaskView) {
                taskView = getTaskViewFromPool(TaskViewType.GROUPED);