summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lucas Dupin <dupin@google.com> 2021-04-05 20:23:36 -0700
committer Lucas Dupin <dupin@google.com> 2021-04-05 20:23:36 -0700
commita2bb76b684f1f14f05637f0936eefb1d78b622de (patch)
tree76156f172c3e958f2451c58e7be568a4e39f8b03
parent3a5a8b856ded85df1964accf2df139e3cdaa7563 (diff)
Slide ripple slower
Slide it over 450ms instead of 105 Fixes: 184594292 Test: visual Change-Id: Ic27bc2eaa618195841c106f486d1bff7676a1e88
-rw-r--r--graphics/java/android/graphics/drawable/RippleShader.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/RippleShader.java b/graphics/java/android/graphics/drawable/RippleShader.java
index aaab3bd0f673..899a5eb3f849 100644
--- a/graphics/java/android/graphics/drawable/RippleShader.java
+++ b/graphics/java/android/graphics/drawable/RippleShader.java
@@ -77,7 +77,7 @@ final class RippleShader extends RuntimeShader {
+ " float scaleIn = subProgress(0., 0.45, in_progress);\n"
+ " float fadeOutNoise = subProgress(0.5, 1., in_progress);\n"
+ " float fadeOutRipple = subProgress(0.5, 0.75, in_progress);\n"
- + " vec2 center = mix(in_touch, in_origin, fadeIn);\n"
+ + " vec2 center = mix(in_touch, in_origin, scaleIn);\n"
+ " float ring = softRing(p, center, in_maxRadius, scaleIn, 0.45);\n"
+ " float alpha = min(fadeIn, 1. - fadeOutNoise);\n"
+ " vec2 uv = p * in_resolutionScale;\n"