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

am: 1f5d3cc

* commit '1f5d3ccc253ab0e4b2abb911a83e7f4d33b6869f':
  Invalidate scrim throughout animation from overlay to workspace.
This commit is contained in:
Tony Wickham
2016-03-29 00:10:18 +00:00
committed by android-build-merger
@@ -697,6 +697,17 @@ public class LauncherStateTransitionAnimation {
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();