Merge "Correctly fade sparkles in" into sc-dev
diff --git a/graphics/java/android/graphics/drawable/RippleShader.java b/graphics/java/android/graphics/drawable/RippleShader.java
index a9b2447..4608d02 100644
--- a/graphics/java/android/graphics/drawable/RippleShader.java
+++ b/graphics/java/android/graphics/drawable/RippleShader.java
@@ -71,7 +71,8 @@
+ " 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"