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

Merge "Migrate AuthRippleView to use RippleShader#FadeParams to deprecate rippleFill." into tm-qpr-dev am: a95c5ae677

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21164368

Change-Id: Id38e723229a601e0a2de736fd355b8c9560d2e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yein Jo
2023-02-07 02:43:19 +00:00
committed by Automerger Merge Worker
parent c9f85ff5e3 a95c5ae677
commit d221988708
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt
View File

@@ -88,6 +88,7 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at
rippleShader.color = 0xffffffff.toInt() // default color rippleShader.color = 0xffffffff.toInt() // default color
rippleShader.rawProgress = 0f rippleShader.rawProgress = 0f
rippleShader.sparkleStrength = RIPPLE_SPARKLE_STRENGTH rippleShader.sparkleStrength = RIPPLE_SPARKLE_STRENGTH
setupRippleFadeParams()
ripplePaint.shader = rippleShader ripplePaint.shader = rippleShader
dwellShader.color = 0xffffffff.toInt() // default color dwellShader.color = 0xffffffff.toInt() // default color
@@ -294,7 +295,6 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at
) )
addListener(object : AnimatorListenerAdapter() { addListener(object : AnimatorListenerAdapter() {
override fun onAnimationStart(animation: Animator?) { override fun onAnimationStart(animation: Animator?) {
rippleShader.rippleFill = false
drawRipple = true drawRipple = true
visibility = VISIBLE visibility = VISIBLE
} }
@@ -339,6 +339,18 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at
) )
} }
private fun setupRippleFadeParams() {
with(rippleShader) {
baseRingFadeParams.fadeOutStart = RippleShader.DEFAULT_BASE_RING_FADE_OUT_START
baseRingFadeParams.fadeOutEnd = RippleShader.DEFAULT_FADE_OUT_END
centerFillFadeParams.fadeInStart = RippleShader.DEFAULT_FADE_IN_START
centerFillFadeParams.fadeInEnd = RippleShader.DEFAULT_CENTER_FILL_FADE_IN_END
centerFillFadeParams.fadeOutStart = RippleShader.DEFAULT_CENTER_FILL_FADE_OUT_START
centerFillFadeParams.fadeOutEnd = RippleShader.DEFAULT_CENTER_FILL_FADE_OUT_END
}
}
override fun onDraw(canvas: Canvas?) { override fun onDraw(canvas: Canvas?) {
// To reduce overdraw, we mask the effect to a circle whose radius is big enough to cover // To reduce overdraw, we mask the effect to a circle whose radius is big enough to cover
// the active effect area. Values here should be kept in sync with the // the active effect area. Values here should be kept in sync with the