diff options
author | Tony Wickham <twickham@google.com> | 2016-08-03 20:09:44 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-03 20:09:44 +0000 |
commit | f0cb6018dd7d91e58d2e9513f63ce7e2710c85d3 (patch) | |
tree | dfb2e212867a6e71fed5d0b16943a5eac33666ec /src/com/android/launcher3/util | |
parent | 7b6e3aea315dd9a73890234d00df1afe277b2c68 (diff) | |
parent | 0ba81607e30c008a7aa24ca76d74f9c4aaafd053 (diff) | |
download | android_packages_apps_Trebuchet-f0cb6018dd7d91e58d2e9513f63ce7e2710c85d3.tar.gz android_packages_apps_Trebuchet-f0cb6018dd7d91e58d2e9513f63ce7e2710c85d3.tar.bz2 android_packages_apps_Trebuchet-f0cb6018dd7d91e58d2e9513f63ce7e2710c85d3.zip |
Merge "Start shortcuts close animation where open left off." into ub-launcher3-calgary
Diffstat (limited to 'src/com/android/launcher3/util')
-rw-r--r-- | src/com/android/launcher3/util/RevealOutlineAnimation.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/com/android/launcher3/util/RevealOutlineAnimation.java b/src/com/android/launcher3/util/RevealOutlineAnimation.java index cd9888232..456047775 100644 --- a/src/com/android/launcher3/util/RevealOutlineAnimation.java +++ b/src/com/android/launcher3/util/RevealOutlineAnimation.java @@ -38,6 +38,8 @@ public abstract class RevealOutlineAnimation extends ViewOutlineProvider { final float elevation = revealView.getElevation(); va.addListener(new AnimatorListenerAdapter() { + private boolean mWasCanceled = false; + public void onAnimationStart(Animator animation) { revealView.setOutlineProvider(RevealOutlineAnimation.this); revealView.setClipToOutline(true); @@ -46,11 +48,18 @@ public abstract class RevealOutlineAnimation extends ViewOutlineProvider { } } + @Override + public void onAnimationCancel(Animator animation) { + mWasCanceled = true; + } + public void onAnimationEnd(Animator animation) { - revealView.setOutlineProvider(ViewOutlineProvider.BACKGROUND); - revealView.setClipToOutline(false); - if (shouldRemoveElevationDuringAnimation()) { - revealView.setTranslationZ(0); + if (!mWasCanceled) { + revealView.setOutlineProvider(ViewOutlineProvider.BACKGROUND); + revealView.setClipToOutline(false); + if (shouldRemoveElevationDuringAnimation()) { + revealView.setTranslationZ(0); + } } } |