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

Merge "Cancel & restart auth ripple if already running" into tm-qpr-dev am: 83f6027ea9

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

Change-Id: I91b874061d943fe1c88e0e8925f7f1a6b752036b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beverly Tai
2023-01-26 17:17:58 +00:00
committed by Automerger Merge Worker
parent 26991b5f50 83f6027ea9
commit 152da6324d
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,11 +55,11 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at
private val fadeDuration = 83L private val fadeDuration = 83L
private val retractDuration = 400L private val retractDuration = 400L
private var alphaInDuration: Long = 0 private var alphaInDuration: Long = 0
private var unlockedRippleInProgress: Boolean = false
private val dwellShader = DwellRippleShader() private val dwellShader = DwellRippleShader()
private val dwellPaint = Paint() private val dwellPaint = Paint()
private val rippleShader = RippleShader() private val rippleShader = RippleShader()
private val ripplePaint = Paint() private val ripplePaint = Paint()
private var unlockedRippleAnimator: AnimatorSet? = null
private var fadeDwellAnimator: Animator? = null private var fadeDwellAnimator: Animator? = null
private var retractDwellAnimator: Animator? = null private var retractDwellAnimator: Animator? = null
private var dwellPulseOutAnimator: Animator? = null private var dwellPulseOutAnimator: Animator? = null
@@ -205,7 +205,7 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at
* Plays a ripple animation that grows to the dwellRadius with distortion. * Plays a ripple animation that grows to the dwellRadius with distortion.
*/ */
fun startDwellRipple(isDozing: Boolean) { fun startDwellRipple(isDozing: Boolean) {
if (unlockedRippleInProgress || dwellPulseOutAnimator?.isRunning == true) { if (unlockedRippleAnimator?.isRunning == true || dwellPulseOutAnimator?.isRunning == true) {
return return
} }
@@ -262,9 +262,7 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at
* Ripple that bursts outwards from the position of the sensor to the edges of the screen * Ripple that bursts outwards from the position of the sensor to the edges of the screen
*/ */
fun startUnlockedRipple(onAnimationEnd: Runnable?) { fun startUnlockedRipple(onAnimationEnd: Runnable?) {
if (unlockedRippleInProgress) { unlockedRippleAnimator?.cancel()
return // Ignore if ripple effect is already playing
}
val rippleAnimator = ValueAnimator.ofFloat(0f, 1f).apply { val rippleAnimator = ValueAnimator.ofFloat(0f, 1f).apply {
interpolator = Interpolators.LINEAR_OUT_SLOW_IN interpolator = Interpolators.LINEAR_OUT_SLOW_IN
@@ -289,14 +287,13 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at
} }
} }
val animatorSet = AnimatorSet().apply { unlockedRippleAnimator = AnimatorSet().apply {
playTogether( playTogether(
rippleAnimator, rippleAnimator,
alphaInAnimator alphaInAnimator
) )
addListener(object : AnimatorListenerAdapter() { addListener(object : AnimatorListenerAdapter() {
override fun onAnimationStart(animation: Animator?) { override fun onAnimationStart(animation: Animator?) {
unlockedRippleInProgress = true
rippleShader.rippleFill = false rippleShader.rippleFill = false
drawRipple = true drawRipple = true
visibility = VISIBLE visibility = VISIBLE
@@ -304,13 +301,13 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at
override fun onAnimationEnd(animation: Animator?) { override fun onAnimationEnd(animation: Animator?) {
onAnimationEnd?.run() onAnimationEnd?.run()
unlockedRippleInProgress = false
drawRipple = false drawRipple = false
visibility = GONE visibility = GONE
unlockedRippleAnimator = null
} }
}) })
} }
animatorSet.start() unlockedRippleAnimator?.start()
} }
fun resetRippleAlpha() { fun resetRippleAlpha() {