Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ce38320 authored Jul 30, 2024 by Austin Delgado Committed by Android (Google) Code Review Jul 30, 2024

Merge "Update BP unlock icon talkback string" into main

parents 4fe4a5ef 1455628b

packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt

+6 −2

Original line number	Diff line number	Diff line
		@@ -382,8 +382,12 @@ object BiometricViewBinder {
		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()
		}

packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptIconViewModel.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -469,7 +469,7 @@ constructor(
		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) {

packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -491,7 +491,7 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa
		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 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa
		.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)
		}