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

Commit bf2d54bb authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

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

Merge "Skip finishResize for non-exit animation if PIP is about to exit" into sc-dev am: 29a2e248 am: 60f3046a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14533077

Change-Id: I6c70529f242d19dfaca41d057c4fb82edd8e3aba
parents 7fff2de0 60f3046a

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+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(