Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ed21de7 authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android (Google) Code Review
Browse files

Merge "Mark window as replacing when moving task to pinned stack."

parents 995ef593 2443f2f1
Loading
Loading
Loading
Loading
+4 −1
Original line number Original line Diff line number Diff line
@@ -2251,7 +2251,10 @@ public final class ActivityStackSupervisor implements DisplayListener {
            // If we didn't actual do a relaunch (indicated by kept==true meaning we kept the old
            // 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
            // 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.
            // 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
        // The task might have already been running and its visibility needs to be synchronized with