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

Commit bf11c01e 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... 

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

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

Change-Id: I60062dd14765f79d0315a0369a8c2e285fa45e9d
parents abff40bc e4b14eac

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

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

        final int left = mWindowFrames.mFrame.left;

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

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

                && !isDragResizing()

                && getWindowConfiguration().hasMovementAnimations()

                && hasMovementAnimation

                && !mWinAnimator.mLastHidden

                && !mSeamlesslyRotated) {

            startMoveAnimation(left, top);