From a2bb76b684f1f14f05637f0936eefb1d78b622de Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Mon, 5 Apr 2021 20:23:36 -0700 Subject: [PATCH] Slide ripple slower Slide it over 450ms instead of 105 Fixes: 184594292 Test: visual Change-Id: Ic27bc2eaa618195841c106f486d1bff7676a1e88 --- graphics/java/android/graphics/drawable/RippleShader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/java/android/graphics/drawable/RippleShader.java b/graphics/java/android/graphics/drawable/RippleShader.java index aaab3bd0f6737..899a5eb3f8499 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"