Merge "Fix issue where animation progress would be overridden"

This commit is contained in:
Lucas Dupin authored and Android (Google) Code Review committed 2019-02-07 00:02:29 +00:00
commit 1d82cfb1f0
2 files changed
+2 -2

No files matched your search

@@ -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;
}
@@ -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,