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

Commit 1455628b authored by Austin Delgado's avatar Austin Delgado
Browse files

Update BP unlock icon talkback string 

Test: Verified talkback string manually
Bug: 353621890
Bug: 353632621
Flag: EXEMPT bugfix
Change-Id: I9c1764ccc044358cdcf3716de57e72175c41e24d
parent c6c0fa1f

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)

                    }