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

Commit 1d82cfb1 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Fix issue where animation progress would be overridden"

parents cff8024a e4ce3662

quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java

+0 −1
Original line number Diff line number Diff line
@@ -390,7 +390,6 @@ public class ClipAnimationHelper { 
        public TransformParams setCurrentRectAndTargetAlpha(RectF currentRect, float targetAlpha) {

            this.currentRect = currentRect;

            this.targetAlpha = targetAlpha;

            this.progress = 1;

            return this;

        }

quickstep/src/com/android/quickstep/views/LauncherRecentsView.java

+2 −1
Original line number Diff line number Diff line
@@ -222,7 +222,8 @@ public class LauncherRecentsView extends RecentsView<Launcher> { 
                mTempRect.top -= offsetY;

            }

            mTempRectF.set(mTempRect);

            mTransformParams.setCurrentRectAndTargetAlpha(mTempRectF, taskView.getAlpha())

            mTransformParams.setProgress(1f)

                    .setCurrentRectAndTargetAlpha(mTempRectF, taskView.getAlpha())

                    .setSyncTransactionApplier(mSyncTransactionApplier);

            if (mRecentsAnimationWrapper.targetSet != null) {

                mClipAnimationHelper.applyTransform(mRecentsAnimationWrapper.targetSet,