commit 1f5d3ccc253ab0e4b2abb911a83e7f4d33b6869f
author Tony Wickham <twickham@google.com> Tue Mar 29 00:02:45 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 29 00:02:45 2016 +0000
tree 92d68bb8a2453635c3d5b229ba1e58d4568ba889
parent 11b644d6e1661e5365f47772b1e6741719f73506
parent 3f6c0ee7f5c75410dfe9e05f31fdb71b21ceecd3

Merge "Invalidate scrim throughout animation from overlay to workspace." into ub-launcher3-calgary

src/com/android/launcher3/LauncherStateTransitionAnimation.java

diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java
index 8855cf0..c5ae9da 100644
--- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java
+++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java
@@ -697,6 +697,17 @@
                 itemsAlpha.setInterpolator(decelerateInterpolator);
                 animation.play(itemsAlpha);
 
+                // Invalidate the scrim throughout the animation to ensure the highlight
+                // cutout is correct throughout.
+                ValueAnimator invalidateScrim = ValueAnimator.ofFloat(0f, 1f);
+                invalidateScrim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+                    @Override
+                    public void onAnimationUpdate(ValueAnimator animation) {
+                        mLauncher.getDragLayer().invalidateScrim();
+                    }
+                });
+                animation.play(invalidateScrim);
+
                 if (material) {
                     // Animate the all apps button
                     float finalRadius = pCb.getMaterialRevealViewStartFinalRadius();