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

Commit e4b14eac authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Do not trigger move animation during PiP transition" into rvc-qpr-dev am: 96bcb1b2 

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

Change-Id: I4d2fd1165ed0cc42e42a03c1f4a556afc1d9a6c8
parents a592f49c 96bcb1b2

services/core/java/com/android/server/wm/WindowState.java

+8 −1
Original line number Original line Diff line number Diff line
@@ -2052,10 +2052,17 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        // animating... let's do something.

        // animating... let's do something.

        final int left = mWindowFrames.mFrame.left;

        final int left = mWindowFrames.mFrame.left;

        final int top = mWindowFrames.mFrame.top;

        final int top = mWindowFrames.mFrame.top;



        // During the transition from pip to fullscreen, the activity windowing mode is set to

        // fullscreen at the beginning while the task is kept in pinned mode. Skip the move

        // animation in such case since the transition is handled in SysUI.

        final boolean hasMovementAnimation = getTask() == null

                ? getWindowConfiguration().hasMovementAnimations()

                : getTask().getWindowConfiguration().hasMovementAnimations();

        if (mToken.okToAnimate()

        if (mToken.okToAnimate()

                && (mAttrs.privateFlags & PRIVATE_FLAG_NO_MOVE_ANIMATION) == 0

                && (mAttrs.privateFlags & PRIVATE_FLAG_NO_MOVE_ANIMATION) == 0

                && !isDragResizing()

                && !isDragResizing()

                && getWindowConfiguration().hasMovementAnimations()

                && hasMovementAnimation

                && !mWinAnimator.mLastHidden

                && !mWinAnimator.mLastHidden

                && !mSeamlesslyRotated) {

                && !mSeamlesslyRotated) {

            startMoveAnimation(left, top);

            startMoveAnimation(left, top);