Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99070201 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Correctly fade sparkles in" into sc-dev

parents d43f23c4 b2e37616

graphics/java/android/graphics/drawable/RippleShader.java

+2 −1
Original line number Diff line number Diff line
@@ -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"