From 9b74306ff0ec69011ad17bf60eda3535bd612c6d Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Tue, 19 Dec 2017 12:09:04 -0800 Subject: [PATCH] Fix bug where Folder gets stuck with an invalid OutlineProvider when cancelled. Bug: 70300667 Change-Id: I05d82c402584175d5fff336a8b7d9811dcf15633 --- .../launcher3/anim/RevealOutlineAnimation.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/com/android/launcher3/anim/RevealOutlineAnimation.java b/src/com/android/launcher3/anim/RevealOutlineAnimation.java index 1312da9762..c6b62fafe8 100644 --- a/src/com/android/launcher3/anim/RevealOutlineAnimation.java +++ b/src/com/android/launcher3/anim/RevealOutlineAnimation.java @@ -34,7 +34,6 @@ public abstract class RevealOutlineAnimation extends ViewOutlineProvider { final float elevation = revealView.getElevation(); va.addListener(new AnimatorListenerAdapter() { - private boolean mWasCanceled = false; private boolean mIsClippedToOutline; private ViewOutlineProvider mOldOutlineProvider; @@ -49,18 +48,11 @@ public abstract class RevealOutlineAnimation extends ViewOutlineProvider { } } - @Override - public void onAnimationCancel(Animator animation) { - mWasCanceled = true; - } - public void onAnimationEnd(Animator animation) { - if (!mWasCanceled) { - revealView.setOutlineProvider(mOldOutlineProvider); - revealView.setClipToOutline(mIsClippedToOutline); - if (shouldRemoveElevationDuringAnimation()) { - revealView.setTranslationZ(0); - } + revealView.setOutlineProvider(mOldOutlineProvider); + revealView.setClipToOutline(mIsClippedToOutline); + if (shouldRemoveElevationDuringAnimation()) { + revealView.setTranslationZ(0); } }