From b2e37616d3241c774be32f78d2e46111d3ab0edc Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Thu, 8 Apr 2021 13:12:58 -0700 Subject: [PATCH] Correctly fade sparkles in The ring that masks sparkles was suddenly appearing after a few frames, causing the sparkles to show up, instead of fade in. Fixes: 184594674 Test: visual Change-Id: Id88c26352379e689663808fa8c70834b7ea840b5 --- graphics/java/android/graphics/drawable/RippleShader.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/graphics/java/android/graphics/drawable/RippleShader.java b/graphics/java/android/graphics/drawable/RippleShader.java index a9b24470bbb5..4608d0276b49 100644 --- a/graphics/java/android/graphics/drawable/RippleShader.java +++ b/graphics/java/android/graphics/drawable/RippleShader.java @@ -71,7 +71,8 @@ final class RippleShader extends RuntimeShader { + " float thickness = 0.3 * radius;\n" + " float currentRadius = radius * progress;\n" + " float circle_outer = softCircle(uv, xy, currentRadius + thickness, blur);\n" - + " float circle_inner = softCircle(uv, xy, currentRadius - thickness, blur);\n" + + " float circle_inner = softCircle(uv, xy, max(currentRadius - thickness, 0.), " + + " blur);\n" + " return saturate(circle_outer - circle_inner);\n" + "}\n" + "float subProgress(float start, float end, float progress) {\n"