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

Commit 8a21f280 authored by Rob Carr's avatar Rob Carr Committed by android-build-merger
Browse files

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

am: bef48230

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

Change-Id: Ieca9090311764dc5c2c05605017541a19f3069a8
parents eabb274a bef48230
Loading
Loading
Loading
Loading
+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);
            }
        }