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

Commit f11637dc authored by Wenhui Yang's avatar Wenhui Yang Committed by Automerger Merge Worker
Browse files

Merge "Fix the biometrics prompt talkback" into tm-qpr-dev am: 432bfe01 am: ffed6479 

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



Change-Id: Ida8918e80407a1f0668fee6042f3f9b79f89d6aa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2f8908a7 ffed6479

packages/SystemUI/res/values/strings.xml

+6 −2
Original line number Original line Diff line number Diff line
@@ -407,8 +407,12 @@ 




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

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

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

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

    <!-- Content description of the fingerprint icon when the system-provided fingerprint dialog is showing, for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <!-- Content description of the fingerprint icon when the system-provided fingerprint dialog is showing, to locate the sensor (tablet) for accessibility (not shown on the screen). [CHAR LIMIT=NONE]-->

    <string name="accessibility_fingerprint_dialog_fingerprint_icon">Fingerprint icon</string>

    <string name="security_settings_sfps_enroll_find_sensor_message" product="tablet">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the tablet.\n\nPressing the power button turns off the screen.</string>

    <!-- Content description of the fingerprint icon when the system-provided fingerprint dialog is showing, to locate the sensor (device) for accessibility (not shown on the screen). [CHAR LIMIT=NONE]-->

    <string name="security_settings_sfps_enroll_find_sensor_message" product="device">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the device.\n\nPressing the power button turns off the screen.</string>

    <!-- Content description of the fingerprint icon when the system-provided fingerprint dialog is showing, to locate the sensor (default) for accessibility (not shown on the screen). [CHAR LIMIT=NONE]-->

    <string name="security_settings_sfps_enroll_find_sensor_message" product="default">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the phone.\n\nPressing the power button turns off the screen.</string>

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

    <!-- 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>

    <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] -->

    <!-- 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

+1 −2
Original line number Original line Diff line number Diff line
@@ -97,7 +97,6 @@ open class AuthBiometricFingerprintIconController( 
        val iconContentDescription = getIconContentDescription(newState)

        val iconContentDescription = getIconContentDescription(newState)

        if (iconContentDescription != null) {

        if (iconContentDescription != null) {

            iconView.contentDescription = iconContentDescription

            iconView.contentDescription = iconContentDescription

            iconViewOverlay.contentDescription = iconContentDescription

        }

        }





        iconView.frame = 0

        iconView.frame = 0
@@ -152,7 +151,7 @@ open class AuthBiometricFingerprintIconController( 
            STATE_AUTHENTICATING_ANIMATING_IN,

            STATE_AUTHENTICATING_ANIMATING_IN,

            STATE_AUTHENTICATING,

            STATE_AUTHENTICATING,

            STATE_PENDING_CONFIRMATION,

            STATE_PENDING_CONFIRMATION,

            STATE_AUTHENTICATED -> R.string.accessibility_fingerprint_dialog_fingerprint_icon

            STATE_AUTHENTICATED -> R.string.security_settings_sfps_enroll_find_sensor_message

            STATE_ERROR,

            STATE_ERROR,

            STATE_HELP -> R.string.biometric_dialog_try_again

            STATE_HELP -> R.string.biometric_dialog_try_again

            else -> null

            else -> null