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

Commit 486fe68f authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

Merge "Do not prematurely update position while bounds animating." into... 

Merge "Do not prematurely update position while bounds animating." into nyc-dev am: 5a6c58e0 am: bef48230
am: 8a21f280

* commit '8a21f280':
  Do not prematurely update position while bounds animating.

Change-Id: I6e341c938f7c3dc702d7500d7ab3b381f4a623a5
parents aa453ebd 8a21f280

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

+8 −4
Original line number Diff line number Diff line
@@ -129,15 +129,19 @@ public class BoundsAnimationController { 
        public void onAnimationStart(Animator animation) {

            if (DEBUG) Slog.d(TAG, "onAnimationStart: mTarget=" + mTarget

                    + " mReplacement=" + mReplacement);

            // Ensure that we have prepared the target for animation before

            // we trigger any size changes, so it can swap surfaces

            // in to appropriate modes, or do as it wishes otherwise.

            if (!mReplacement) {

                mTarget.onAnimationStart();

            }



            // Ensure that we have prepared the target for animation before

            // we trigger any size changes, so it can swap surfaces

            // in to appropriate modes, or do as it wishes otherwise.

            // Immediately update the task bounds if they have to become larger, but preserve

            // the starting position so we don't jump at the beginning of the animation.

            if (animatingToLargerSize()) {

                mTarget.setPinnedStackSize(mFrom, mTo);

                mTmpRect.set(mFrom.left, mFrom.top,

                        mFrom.left + mFrozenTaskWidth, mFrom.top + mFrozenTaskHeight);

                mTarget.setPinnedStackSize(mFrom, mTmpRect);

            }

        }