commit 9b74306ff0ec69011ad17bf60eda3535bd612c6d
author Jon Miranda <jonmiranda@google.com> Tue Dec 19 12:09:04 2017 -0800
committer Jon Miranda <jonmiranda@google.com> Tue Dec 19 12:09:04 2017 -0800
tree 2ef204aa9802134cd88e5c6a650378a0c0f2fc9d
parent e15e2a8267c677a41bd91eac4d79ee36d467d8d4

Fix bug where Folder gets stuck with an invalid OutlineProvider when cancelled.

Bug: 70300667
Change-Id: I05d82c402584175d5fff336a8b7d9811dcf15633

src/com/android/launcher3/anim/RevealOutlineAnimation.java

diff --git a/src/com/android/launcher3/anim/RevealOutlineAnimation.java b/src/com/android/launcher3/anim/RevealOutlineAnimation.java
index 1312da9..c6b62fa 100644
--- a/src/com/android/launcher3/anim/RevealOutlineAnimation.java
+++ b/src/com/android/launcher3/anim/RevealOutlineAnimation.java
@@ -34,7 +34,6 @@
         final float elevation = revealView.getElevation();
 
         va.addListener(new AnimatorListenerAdapter() {
-            private boolean mWasCanceled = false;
             private boolean mIsClippedToOutline;
             private ViewOutlineProvider mOldOutlineProvider;
 
@@ -49,18 +48,11 @@
                 }
             }
 
-            @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);
                 }
             }