From 66548b1f7aa283e47c5b7c06cb8cfe91ae4d2343 Mon Sep 17 00:00:00 2001 From: Jorge Gil Date: Mon, 17 May 2021 23:06:23 +0000 Subject: [PATCH] Revert "Skip finishResize for non-exit animation if PIP is about to exit" This reverts commit fa915cb52c2a8dea04928b2195f2d13c3deaabc9. Reason for revert: b/188455492 Bug: 188455492 Change-Id: Ie18a8cd234a8ecf5a7fc0d6c5cdf05f158f3a7e6 --- .../com/android/wm/shell/pip/PipTaskOrganizer.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index 8d3c3e80913b3..4ce6c9e35e9ee 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -184,16 +184,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, mDeferredAnimEndTransaction = tx; return; } - - if (mState != State.EXITING_PIP || direction == TRANSITION_DIRECTION_LEAVE_PIP) { - // Finish resize as long as we're not exiting PIP, or, if we are, only if this is - // the end of the leave PIP animation. - // This is necessary in case there was a resize animation ongoing when exit PIP - // started, in which case the first resize will be skipped to let the exit - // operation handle the final resize out of PIP mode. See b/185306679. - finishResize(tx, destinationBounds, direction, animationType); - sendOnPipTransitionFinished(direction); - } + finishResize(tx, destinationBounds, direction, animationType); + sendOnPipTransitionFinished(direction); if (direction == TRANSITION_DIRECTION_TO_PIP) { // TODO (b//169221267): Add jank listener for transactions without buffer updates. //InteractionJankMonitor.getInstance().end(