commit 069946b1ea0d9a002e49b9222f3f3aba8272b46d
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Dec 19 21:34:49 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 19 21:34:49 2017 +0000
tree 1ccdf210fc2d6a3b1cbd1760b80b61aab40dc7e5
parent 9e3056071b86cd7a36d4e093f5e15ca0e544080a
parent 9b74306ff0ec69011ad17bf60eda3535bd612c6d

Merge "Fix bug where Folder gets stuck with an invalid OutlineProvider when cancelled." into ub-launcher3-master

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);
                 }
             }