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

Commit ab369e10 authored by Austin Delgado's avatar Austin Delgado Committed by Automerger Merge Worker
Browse files

Merge "Update content description for BP icon after auth" into udc-d1-dev am:... 

Merge "Update content description for BP icon after auth" into udc-d1-dev am: cbce6969 am: c6bdea44

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



Change-Id: I62ea673add898e5f0fcacefd4b5aa9e42bca2dce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ded1156 c6bdea44

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -439,6 +439,8 @@ 
    <string name="face_reenroll_failure_dialog_content">Couldn\u2019t set up face unlock. Go to Settings to try again.</string>

    <!-- Message shown when the system-provided fingerprint dialog is shown, asking for authentication -->

    <string name="fingerprint_dialog_touch_sensor">Touch the fingerprint sensor</string>

    <!-- Content description after successful auth when confirmation required -->

    <string name="fingerprint_dialog_authenticated_confirmation">Press the unlock icon to continue</string>

    <!-- Message shown to inform the user a face cannot be recognized and fingerprint should instead be used.[CHAR LIMIT=50] -->

    <string name="fingerprint_dialog_use_fingerprint_instead">Can\u2019t recognize face. Use fingerprint instead.</string>

    <!-- Message shown to inform the user a face cannot be recognized and fingerprint should instead be used.[CHAR LIMIT=50] -->

packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintIconController.kt

+6 −1
Original line number Diff line number Diff line
@@ -142,13 +142,18 @@ open class AuthBiometricFingerprintIconController( 
            STATE_IDLE,

            STATE_AUTHENTICATING_ANIMATING_IN,

            STATE_AUTHENTICATING,

            STATE_PENDING_CONFIRMATION,

            STATE_AUTHENTICATED ->

                if (isSideFps) {

                    R.string.security_settings_sfps_enroll_find_sensor_message

                } else {

                    R.string.fingerprint_dialog_touch_sensor

                }

            STATE_PENDING_CONFIRMATION ->

                if (isSideFps) {

                    R.string.security_settings_sfps_enroll_find_sensor_message

                } else {

                    R.string.fingerprint_dialog_authenticated_confirmation

                }

            STATE_ERROR,

            STATE_HELP -> R.string.biometric_dialog_try_again

            else -> null