Merge "Fix a bug where the running task would be drawn below recents task" into main

2024-10-04 18:25:58 +00:00
parent f843e5dd53 c407f1aa5a
commit b0354e7be9
1 changed files with 11 additions and 7 deletions
@@ -5419,6 +5419,7 @@ public abstract class RecentsView<

        int taskIndex = indexOfChild(taskView);
        int centerTaskIndex = getCurrentPage();
+        boolean isRunningTask = taskView.isRunningTask();

        float toScale = getMaxScaleForFullScreen();
        boolean showAsGrid = showAsGrid();
@@ -5437,13 +5438,16 @@ public abstract class RecentsView<
                            mTempPointF);
                    setPivotX(mTempPointF.x);
                    setPivotY(mTempPointF.y);
-                    runActionOnRemoteHandles(
-                            remoteTargetHandle -> {
-                                remoteTargetHandle.getTaskViewSimulator().setPivotOverride(
-                                        mTempPointF);
-                                remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(
-                                        false);
-                            });
+
+                    if (!isRunningTask) {
+                        runActionOnRemoteHandles(
+                                remoteTargetHandle -> {
+                                    remoteTargetHandle.getTaskViewSimulator().setPivotOverride(
+                                            mTempPointF);
+                                    remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(
+                                            false);
+                                });
+                    }
                }
            });
        } else if (!showAsGrid) {