diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-07-06 11:45:18 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-07-06 11:48:46 -0700 |
| commit | 2245fa23796fe6243521f0dff172a39a62bff54c (patch) | |
| tree | a9717156006f1ddab636e35cc8232b9a2699290f /src/com/android/launcher3/util | |
| parent | 2598d3ce5b7571e3e781a77da7bee8f7f224f294 (diff) | |
| download | android_packages_apps_Trebuchet-2245fa23796fe6243521f0dff172a39a62bff54c.tar.gz android_packages_apps_Trebuchet-2245fa23796fe6243521f0dff172a39a62bff54c.tar.bz2 android_packages_apps_Trebuchet-2245fa23796fe6243521f0dff172a39a62bff54c.zip | |
Using background outline provider as the final provider for reveal animation
> When two animations are running simultaneously, getOutlineProvider does not
give the correct provider
Bug: 22166935
Change-Id: I54c9bcd8cf42dd130949ea98e87c77389c02d00f
Diffstat (limited to 'src/com/android/launcher3/util')
| -rw-r--r-- | src/com/android/launcher3/util/UiThreadCircularReveal.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/util/UiThreadCircularReveal.java b/src/com/android/launcher3/util/UiThreadCircularReveal.java index c7324fb1b..c8e1df289 100644 --- a/src/com/android/launcher3/util/UiThreadCircularReveal.java +++ b/src/com/android/launcher3/util/UiThreadCircularReveal.java @@ -15,11 +15,15 @@ import com.android.launcher3.Utilities; public class UiThreadCircularReveal { public static ValueAnimator createCircularReveal(View v, int x, int y, float r0, float r1) { + return createCircularReveal(v, x, y, r0, r1, ViewOutlineProvider.BACKGROUND); + } + + public static ValueAnimator createCircularReveal(View v, int x, int y, float r0, float r1, + final ViewOutlineProvider originalProvider) { ValueAnimator va = ValueAnimator.ofFloat(0f, 1f); final View revealView = v; final RevealOutlineProvider outlineProvider = new RevealOutlineProvider(x, y, r0, r1); - final ViewOutlineProvider originalProvider = revealView.getOutlineProvider(); final float elevation = v.getElevation(); va.addListener(new AnimatorListenerAdapter() { |