Increase the size of ripple sparkle (5501d76c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/charging/ChargingRippleView.kt

+12 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,13 +20,14 @@ import android.animation.Animator
	import android.animation.AnimatorListenerAdapter		import android.animation.AnimatorListenerAdapter
	import android.animation.ValueAnimator		import android.animation.ValueAnimator
	import android.content.Context		import android.content.Context
			import android.content.res.Configuration
	import android.graphics.Canvas		import android.graphics.Canvas
	import android.graphics.Paint		import android.graphics.Paint
	import android.graphics.PointF		import android.graphics.PointF
	import android.util.AttributeSet		import android.util.AttributeSet
	import android.view.View		import android.view.View

	private const val RIPPLE_SPARKLE_STRENGTH: Float = 0.4f		private const val RIPPLE_SPARKLE_STRENGTH: Float = 0.3f

	/**		/**
	* Expanding ripple effect that shows when charging begins.		* Expanding ripple effect that shows when charging begins.
	@@ -51,6 +52,16 @@ class ChargingRippleView(context: Context?, attrs: AttributeSet?) : View(context
	visibility = View.GONE		visibility = View.GONE
	}		}

			override fun onConfigurationChanged(newConfig: Configuration?) {
			rippleShader.pixelDensity = resources.displayMetrics.density
			super.onConfigurationChanged(newConfig)
			}

			override fun onAttachedToWindow() {
			rippleShader.pixelDensity = resources.displayMetrics.density
			super.onAttachedToWindow()
			}

	fun startRipple() {		fun startRipple() {
	if (rippleInProgress) {		if (rippleInProgress) {
	return // Ignore if ripple effect is already playing		return // Ignore if ripple effect is already playing

packages/SystemUI/src/com/android/systemui/statusbar/charging/RippleShader.kt

+19 −10

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,7 @@ class RippleShader internal constructor() : RuntimeShader(SHADER, false) {
	uniform float in_fadeCircle;		uniform float in_fadeCircle;
	uniform float in_fadeRing;		uniform float in_fadeRing;
	uniform float in_blur;		uniform float in_blur;
			uniform float in_pixelDensity;
	uniform vec4 in_color;		uniform vec4 in_color;
	uniform float in_sparkle_strength;"""		uniform float in_sparkle_strength;"""
	private const val SHADER_LIB = """float triangleNoise(vec2 n) {		private const val SHADER_LIB = """float triangleNoise(vec2 n) {
	@@ -60,12 +61,13 @@ class RippleShader internal constructor() : RuntimeShader(SHADER, false) {
	float n = triangleNoise(uv);		float n = triangleNoise(uv);
	float s = 0.0;		float s = 0.0;
	for (float i = 0; i < 4; i += 1) {		for (float i = 0; i < 4; i += 1) {
	float l = i * 0.25;		float l = i * 0.01;
	float h = l + 0.005;		float h = l + 0.1;
	float o = abs(sin(0.1 * PI * (t + i)));		float o = smoothstep(n - l, h, n);
	s += threshold(n + o, l, h);		o = abs(sin(PI o * (t + 0.55 * i)));
			s += o;
	}		}
	return saturate(s);		return s;
	}		}

	float softCircle(vec2 uv, vec2 xy, float radius, float blur) {		float softCircle(vec2 uv, vec2 xy, float radius, float blur) {
	@@ -96,10 +98,11 @@ class RippleShader internal constructor() : RuntimeShader(SHADER, false) {

	// Draw shapes		// Draw shapes
	float sparkleRing = softRing(p_distorted, in_origin, in_radius, in_blur);		float sparkleRing = softRing(p_distorted, in_origin, in_radius, in_blur);
	float sparkle = sparkles(p, in_time * 0.000033) * sparkleRing * in_fadeSparkle;		float sparkle = sparkles(p - mod(p, in_pixelDensity * 0.8), in_time * 0.00175)
			* sparkleRing * in_fadeSparkle;
	float circle = softCircle(p_distorted, in_origin, in_radius * 1.2, in_blur);		float circle = softCircle(p_distorted, in_origin, in_radius * 1.2, in_blur);
	float rippleAlpha = max(circle * in_fadeCircle,		float rippleAlpha = max(circle * in_fadeCircle,
	softRing(p_distorted, in_origin, in_radius, in_blur) * in_fadeRing) * 0.36;		softRing(p_distorted, in_origin, in_radius, in_blur) * in_fadeRing) * 0.45;
	vec4 ripple = in_color * rippleAlpha;		vec4 ripple = in_color * rippleAlpha;
	return mix(ripple, vec4(sparkle), sparkle * in_sparkle_strength);		return mix(ripple, vec4(sparkle), sparkle * in_sparkle_strength);
	}"""		}"""
	@@ -139,12 +142,12 @@ class RippleShader internal constructor() : RuntimeShader(SHADER, false) {
	field = value		field = value
	setUniform("in_progress", value)		setUniform("in_progress", value)
	setUniform("in_radius",		setUniform("in_radius",
	(1 - (1 - value) * (1 - value) * (1 - value))* 1.2f * radius)		(1 - (1 - value) * (1 - value) * (1 - value))* radius)
	setUniform("in_blur", MathUtils.lerp(1.25f, 0.5f, value))		setUniform("in_blur", MathUtils.lerp(1.25f, 0.5f, value))

	val fadeIn = subProgress(0f, 0.1f, value)		val fadeIn = subProgress(0f, 0.1f, value)
	val fadeOutNoise = subProgress(0.8f, 1f, value)		val fadeOutNoise = subProgress(0.4f, 1f, value)
	val fadeOutRipple = subProgress(0.4f, 1f, value)		val fadeOutRipple = subProgress(0.3f, 1f, value)
	val fadeCircle = subProgress(0f, 0.2f, value)		val fadeCircle = subProgress(0f, 0.2f, value)
	setUniform("in_fadeSparkle", Math.min(fadeIn, 1 - fadeOutNoise))		setUniform("in_fadeSparkle", Math.min(fadeIn, 1 - fadeOutNoise))
	setUniform("in_fadeCircle", 1 - fadeCircle)		setUniform("in_fadeCircle", 1 - fadeCircle)
	@@ -191,4 +194,10 @@ class RippleShader internal constructor() : RuntimeShader(SHADER, false) {
	setUniform("in_distort_radial", 75 * progress * value)		setUniform("in_distort_radial", 75 * progress * value)
	setUniform("in_distort_xy", 75 * value)		setUniform("in_distort_xy", 75 * value)
	}		}

			var pixelDensity: Float = 1.0f
			set(value) {
			field = value
			setUniform("in_pixelDensity", value)
			}
	}		}