Reformat file before making actual functional change
To make it easier to code review post-reformatting
Bug: 352346058
Test: builds
Flag: EXEMPT bugfix
Change-Id: I55fd7d24b971fee9827e5bc48dc51c3c33f2efc9
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt
index d2c6227..c95a94e 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt
@@ -61,14 +61,16 @@
/**
* Controls two ripple effects:
- * 1. Unlocked ripple: shows when authentication is successful
- * 2. UDFPS dwell ripple: shows when the user has their finger down on the UDFPS area and reacts
- * to errors and successes
+ * 1. Unlocked ripple: shows when authentication is successful
+ * 2. UDFPS dwell ripple: shows when the user has their finger down on the UDFPS area and reacts to
+ * errors and successes
*
* The ripple uses the accent color of the current theme.
*/
@SysUISingleton
-class AuthRippleController @Inject constructor(
+class AuthRippleController
+@Inject
+constructor(
private val sysuiContext: Context,
private val authController: AuthController,
private val configurationController: ConfigurationController,
@@ -92,8 +94,7 @@
KeyguardStateController.Callback,
WakefulnessLifecycle.Observer {
- @VisibleForTesting
- internal var startLightRevealScrimOnKeyguardFadingAway = false
+ @VisibleForTesting internal var startLightRevealScrimOnKeyguardFadingAway = false
var lightRevealScrimAnimator: ValueAnimator? = null
var fingerprintSensorLocation: Point? = null
private var faceSensorLocation: Point? = null
@@ -141,15 +142,17 @@
private val biometricModeListener =
object : BiometricUnlockController.BiometricUnlockEventsListener {
override fun onBiometricUnlockedWithKeyguardDismissal(
- biometricSourceType: BiometricSourceType?
+ biometricSourceType: BiometricSourceType?
) {
DeviceEntryUdfpsRefactor.assertInLegacyMode()
if (biometricSourceType != null) {
showUnlockRippleInternal(biometricSourceType)
} else {
- logger.log(TAG,
- LogLevel.ERROR,
- "Unexpected scenario where biometricSourceType is null")
+ logger.log(
+ TAG,
+ LogLevel.ERROR,
+ "Unexpected scenario where biometricSourceType is null"
+ )
}
}
}
@@ -168,16 +171,16 @@
notificationShadeWindowController.setForcePluginOpen(false, this)
}
- @Deprecated("Update authRippleInteractor.showUnlockRipple instead of calling this.")
- fun showUnlockRipple(biometricSourceType: BiometricSourceType) {
- DeviceEntryUdfpsRefactor.assertInLegacyMode()
- showUnlockRippleInternal(biometricSourceType)
- }
+ @Deprecated("Update authRippleInteractor.showUnlockRipple instead of calling this.")
+ fun showUnlockRipple(biometricSourceType: BiometricSourceType) {
+ DeviceEntryUdfpsRefactor.assertInLegacyMode()
+ showUnlockRippleInternal(biometricSourceType)
+ }
private fun showUnlockRippleInternal(biometricSourceType: BiometricSourceType) {
val keyguardNotShowing = !keyguardStateController.isShowing
- val unlockNotAllowed = !keyguardUpdateMonitor
- .isUnlockingWithBiometricAllowed(biometricSourceType)
+ val unlockNotAllowed =
+ !keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(biometricSourceType)
if (keyguardNotShowing || unlockNotAllowed) {
logger.notShowingUnlockRipple(keyguardNotShowing, unlockNotAllowed)
return
@@ -187,30 +190,32 @@
if (biometricSourceType == BiometricSourceType.FINGERPRINT) {
fingerprintSensorLocation?.let {
mView.setFingerprintSensorLocation(it, udfpsRadius)
- circleReveal = CircleReveal(
+ circleReveal =
+ CircleReveal(
it.x,
it.y,
0,
Math.max(
- Math.max(it.x, displayMetrics.widthPixels - it.x),
- Math.max(it.y, displayMetrics.heightPixels - it.y)
+ Math.max(it.x, displayMetrics.widthPixels - it.x),
+ Math.max(it.y, displayMetrics.heightPixels - it.y)
)
- )
+ )
logger.showingUnlockRippleAt(it.x, it.y, "FP sensor radius: $udfpsRadius")
showUnlockedRipple()
}
} else if (biometricSourceType == BiometricSourceType.FACE) {
faceSensorLocation?.let {
mView.setSensorLocation(it)
- circleReveal = CircleReveal(
+ circleReveal =
+ CircleReveal(
it.x,
it.y,
0,
Math.max(
- Math.max(it.x, displayMetrics.widthPixels - it.x),
- Math.max(it.y, displayMetrics.heightPixels - it.y)
+ Math.max(it.x, displayMetrics.widthPixels - it.x),
+ Math.max(it.y, displayMetrics.heightPixels - it.y)
)
- )
+ )
logger.showingUnlockRippleAt(it.x, it.y, "Face unlock ripple")
showUnlockedRipple()
}
@@ -234,9 +239,7 @@
mView.startUnlockedRipple(
/* end runnable */
- Runnable {
- notificationShadeWindowController.setForcePluginOpen(false, this)
- }
+ Runnable { notificationShadeWindowController.setForcePluginOpen(false, this) }
)
}
@@ -248,32 +251,36 @@
if (keyguardStateController.isKeyguardFadingAway) {
if (startLightRevealScrimOnKeyguardFadingAway) {
lightRevealScrimAnimator?.cancel()
- lightRevealScrimAnimator = ValueAnimator.ofFloat(.1f, 1f).apply {
- interpolator = Interpolators.LINEAR_OUT_SLOW_IN
- duration = RIPPLE_ANIMATION_DURATION
- startDelay = keyguardStateController.keyguardFadingAwayDelay
- addUpdateListener { animator ->
- if (lightRevealScrim.revealEffect != circleReveal) {
- // if something else took over the reveal, let's cancel ourselves
- cancel()
- return@addUpdateListener
- }
- lightRevealScrim.revealAmount = animator.animatedValue as Float
- }
- addListener(object : AnimatorListenerAdapter() {
- override fun onAnimationEnd(animation: Animator) {
- // Reset light reveal scrim to the default, so the CentralSurfaces
- // can handle any subsequent light reveal changes
- // (ie: from dozing changes)
- if (lightRevealScrim.revealEffect == circleReveal) {
- lightRevealScrim.revealEffect = LiftReveal
+ lightRevealScrimAnimator =
+ ValueAnimator.ofFloat(.1f, 1f).apply {
+ interpolator = Interpolators.LINEAR_OUT_SLOW_IN
+ duration = RIPPLE_ANIMATION_DURATION
+ startDelay = keyguardStateController.keyguardFadingAwayDelay
+ addUpdateListener { animator ->
+ if (lightRevealScrim.revealEffect != circleReveal) {
+ // if something else took over the reveal, let's cancel ourselves
+ cancel()
+ return@addUpdateListener
}
-
- lightRevealScrimAnimator = null
+ lightRevealScrim.revealAmount = animator.animatedValue as Float
}
- })
- start()
- }
+ addListener(
+ object : AnimatorListenerAdapter() {
+ override fun onAnimationEnd(animation: Animator) {
+ // Reset light reveal scrim to the default, so the
+ // CentralSurfaces
+ // can handle any subsequent light reveal changes
+ // (ie: from dozing changes)
+ if (lightRevealScrim.revealEffect == circleReveal) {
+ lightRevealScrim.revealEffect = LiftReveal
+ }
+
+ lightRevealScrimAnimator = null
+ }
+ }
+ )
+ start()
+ }
startLightRevealScrimOnKeyguardFadingAway = false
}
}
@@ -297,8 +304,9 @@
}
private fun updateRippleColor() {
- mView.setLockScreenColor(Utils.getColorAttrDefaultColor(sysuiContext,
- R.attr.wallpaperTextColorAccent))
+ mView.setLockScreenColor(
+ Utils.getColorAttrDefaultColor(sysuiContext, R.attr.wallpaperTextColorAccent)
+ )
}
private fun showDwellRipple() {
@@ -321,40 +329,43 @@
}
}
- override fun onBiometricAuthFailed(biometricSourceType: BiometricSourceType) {
- if (biometricSourceType == BiometricSourceType.FINGERPRINT) {
- mView.retractDwellRipple()
+ override fun onBiometricAuthFailed(biometricSourceType: BiometricSourceType) {
+ if (biometricSourceType == BiometricSourceType.FINGERPRINT) {
+ mView.retractDwellRipple()
+ }
}
- }
- override fun onBiometricAcquired(
- biometricSourceType: BiometricSourceType,
- acquireInfo: Int
- ) {
- if (biometricSourceType == BiometricSourceType.FINGERPRINT &&
- BiometricFingerprintConstants.shouldDisableUdfpsDisplayMode(acquireInfo) &&
- acquireInfo != BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_GOOD) {
- // received an 'acquiredBad' message, so immediately retract
- mView.retractDwellRipple()
+ override fun onBiometricAcquired(
+ biometricSourceType: BiometricSourceType,
+ acquireInfo: Int
+ ) {
+ if (
+ biometricSourceType == BiometricSourceType.FINGERPRINT &&
+ BiometricFingerprintConstants.shouldDisableUdfpsDisplayMode(acquireInfo) &&
+ acquireInfo != BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_GOOD
+ ) {
+ // received an 'acquiredBad' message, so immediately retract
+ mView.retractDwellRipple()
+ }
}
- }
- override fun onKeyguardBouncerStateChanged(bouncerIsOrWillBeShowing: Boolean) {
- if (bouncerIsOrWillBeShowing) {
- mView.fadeDwellRipple()
+ override fun onKeyguardBouncerStateChanged(bouncerIsOrWillBeShowing: Boolean) {
+ if (bouncerIsOrWillBeShowing) {
+ mView.fadeDwellRipple()
+ }
}
}
- }
private val configurationChangedListener =
object : ConfigurationController.ConfigurationListener {
override fun onUiModeChanged() {
updateRippleColor()
}
+
override fun onThemeChanged() {
updateRippleColor()
}
- }
+ }
private val udfpsControllerCallback =
object : UdfpsController.Callback {
@@ -402,9 +413,11 @@
when (args[0]) {
"dwell" -> {
showDwellRipple()
- pw.println("lock screen dwell ripple: " +
+ pw.println(
+ "lock screen dwell ripple: " +
"\n\tsensorLocation=$fingerprintSensorLocation" +
- "\n\tudfpsRadius=$udfpsRadius")
+ "\n\tudfpsRadius=$udfpsRadius"
+ )
}
"fingerprint" -> {
pw.println("fingerprint ripple sensorLocation=$fingerprintSensorLocation")
@@ -416,9 +429,11 @@
showUnlockRippleInternal(BiometricSourceType.FACE)
}
"custom" -> {
- if (args.size != 3 ||
- args[1].toFloatOrNull() == null ||
- args[2].toFloatOrNull() == null) {
+ if (
+ args.size != 3 ||
+ args[1].toFloatOrNull() == null ||
+ args[2].toFloatOrNull() == null
+ ) {
invalidCommand(pw)
return
}