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

Commit a6f32e2c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update bad calibration error message" into udc-dev am: 1df5ad89 am: 1efd1f6d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010



Change-Id: I343c82faae3d9fb135d4e9e500923a3fec91de4e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 67b92348 1efd1f6d

res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -1056,8 +1056,10 @@ 
    <string name="security_fingerprint_disclaimer_lockscreen_disabled_2">You can still use your fingerprint to authorize purchases and app access.</string>

    <!-- Text shown in fingerprint enroll when we didn't observe progress for a few seconds. [CHAR LIMIT=100] -->

    <string name="security_settings_fingerprint_enroll_lift_touch_again">Lift finger, then touch sensor again</string>

    <!-- Dialog title during fingerprint enrollment to indicate bad sensor calibration. [CHAR LIMIT=100] -->

    <string name="security_settings_fingerprint_bad_calibration_title">Can\u2019t use fingerprint sensor</string>

    <!-- Text shown during fingerprint enrollment to indicate bad sensor calibration. [CHAR LIMIT=100] -->

    <string name="security_settings_fingerprint_bad_calibration">Can\u2019t use fingerprint sensor. Visit a repair provider</string>

    <string name="security_settings_fingerprint_bad_calibration">Visit a repair provider.</string>

    <!-- Title for the section that has additional security settings. [CHAR LIMIT=60] -->

    <string name="security_advanced_settings">More security settings</string>

    <!-- String for the "More security settings" summary when a work profile is on the device. [CHAR_LIMIT=NONE] -->

src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java

+2 −0
Original line number Diff line number Diff line
@@ -163,6 +163,8 @@ public class FingerprintErrorDialog extends InstrumentedDialogFragment { 
        switch (errMsgId) {

            case FingerprintManager.FINGERPRINT_ERROR_TIMEOUT:

                return R.string.security_settings_fingerprint_enroll_error_dialog_title;

            case FingerprintManager.FINGERPRINT_ERROR_BAD_CALIBRATION:

                return R.string.security_settings_fingerprint_bad_calibration_title;

            default:

                return R.string

                        .security_settings_fingerprint_enroll_error_unable_to_process_dialog_title;