Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correctly fade sparkles in" into sc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2021-04-08 23:28:56 +00:00
committed by Android (Google) Code Review
parent d43f23c491 b2e37616d3
commit 990702017c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
graphics/java/android/graphics/drawable/RippleShader.java
View File

@@ -71,7 +71,8 @@ final class RippleShader extends RuntimeShader {
+ " float thickness = 0.3 * radius;\n" + " float thickness = 0.3 * radius;\n"
+ " float currentRadius = radius * progress;\n" + " float currentRadius = radius * progress;\n"
+ " float circle_outer = softCircle(uv, xy, currentRadius + thickness, blur);\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" + " return saturate(circle_outer - circle_inner);\n"
+ "}\n" + "}\n"
+ "float subProgress(float start, float end, float progress) {\n" + "float subProgress(float start, float end, float progress) {\n"