Merge "Update BP unlock icon talkback string" into main
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt
index ecfbd66..9f6d565 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt
@@ -382,8 +382,12 @@
backgroundView.importantForAccessibility =
IMPORTANT_FOR_ACCESSIBILITY_NO
- // Allow icon to be used as confirmation button with a11y enabled
- if (accessibilityManager.isTouchExplorationEnabled) {
+ // Allow icon to be used as confirmation button with udfps and a11y
+ // enabled
+ if (
+ accessibilityManager.isTouchExplorationEnabled &&
+ modalities.hasUdfps
+ ) {
iconOverlayView.setOnClickListener {
viewModel.confirmAuthenticated()
}
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptIconViewModel.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptIconViewModel.kt
index 6c83dac..c089143 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptIconViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptIconViewModel.kt
@@ -469,7 +469,7 @@
if (isPendingConfirmation) {
when (sensorType) {
FingerprintSensorType.POWER_BUTTON -> -1
- else -> R.string.fingerprint_dialog_authenticated_confirmation
+ else -> R.string.biometric_dialog_confirm
}
} else if (isAuthenticating || isAuthenticated) {
when (sensorType) {
diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt
index 9df653f..e603db4 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt
@@ -491,7 +491,7 @@
assertThat(iconAsset)
.isEqualTo(R.raw.fingerprint_dialogue_error_to_unlock_lottie)
assertThat(iconContentDescriptionId)
- .isEqualTo(R.string.fingerprint_dialog_authenticated_confirmation)
+ .isEqualTo(R.string.biometric_dialog_confirm)
assertThat(shouldAnimateIconView).isEqualTo(true)
// Confirm authentication
@@ -601,7 +601,7 @@
.isEqualTo(R.raw.fingerprint_dialogue_fingerprint_to_unlock_lottie)
assertThat(iconOverlayAsset).isEqualTo(-1)
assertThat(iconContentDescriptionId)
- .isEqualTo(R.string.fingerprint_dialog_authenticated_confirmation)
+ .isEqualTo(R.string.biometric_dialog_confirm)
assertThat(shouldAnimateIconView).isEqualTo(true)
assertThat(shouldAnimateIconOverlay).isEqualTo(false)
}