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

Commit 29a2e248 authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge "Skip finishResize for non-exit animation if PIP is about to exit" into sc-dev

parents 07756fb3 fa915cb5
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -185,8 +185,16 @@ 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);
            }
            if (direction == TRANSITION_DIRECTION_TO_PIP) {
                // TODO (b//169221267): Add jank listener for transactions without buffer updates.
                //InteractionJankMonitor.getInstance().end(