commit ec66a6d0f70e1c823f5fec6d3ae61932d2e793be
author Adam Cohen <adamcohen@google.com> Thu Jul 16 00:53:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 16 00:53:56 2015 +0000
tree 73abbd6c48eb48c987887a8e13695835fcc5e38b
parent 1990e062561c2f5cb29d811abee67b4288797986
parent 84a62861d6ba91f3b0822d6da0c1c7eedf9b3f0e

am 84a62861: Merge "Fix issue with UiThreadReveal on L devices" into ub-launcher3-burnaby

* commit '84a62861d6ba91f3b0822d6da0c1c7eedf9b3f0e':
  Fix issue with UiThreadReveal on L devices

src/com/android/launcher3/util/UiThreadCircularReveal.java

diff --git a/src/com/android/launcher3/util/UiThreadCircularReveal.java b/src/com/android/launcher3/util/UiThreadCircularReveal.java
index c8e1df2..3ca3aee 100644
--- a/src/com/android/launcher3/util/UiThreadCircularReveal.java
+++ b/src/com/android/launcher3/util/UiThreadCircularReveal.java
@@ -46,10 +46,8 @@
             public void onAnimationUpdate(ValueAnimator arg0) {
                 float progress = arg0.getAnimatedFraction();
                 outlineProvider.setProgress(progress);
-                if (Utilities.isLmpMR1OrAbove()) {
-                    revealView.invalidateOutline();
-                } else {
-                    // On L, a bug requires calling a full view invalidate.
+                revealView.invalidateOutline();
+                if (!Utilities.isLmpMR1OrAbove()) {
                     revealView.invalidate();
                 }
             }