Mark window as replacing when moving task to pinned stack.
Bug: 25672053
Change-Id: I0b66faf5af25edba55c4cb51b3527dee2a528451
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index d9dd77d..1fc674b 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2251,7 +2251,10 @@
// If we didn't actual do a relaunch (indicated by kept==true meaning we kept the old
// window), we need to clear the replace window settings. Otherwise, we schedule a
// timeout to remove the old window if the replacing window is not coming in time.
- mWindowManager.scheduleClearReplacingWindowIfNeeded(topActivity.appToken, !kept);
+ // In case of the pinned stack we don't resize the task during the move, but we will
+ // resize the stack soon after so we want to retain the replacing window.
+ mWindowManager.scheduleClearReplacingWindowIfNeeded(topActivity.appToken,
+ !kept || stackId == PINNED_STACK_ID);
}
// The task might have already been running and its visibility needs to be synchronized with