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

Commit a37c1933 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d15 am: 6ca804be

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

Change-Id: I815dfc484a96618d7c0b02c955c212cdbf36287b
parents 25a3914e 6ca804be
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -1212,6 +1212,8 @@
        <annotation id="url">Learn more</annotation></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>
    <!-- Text shown during fingerprint enrollment to indicate bad sensor calibration. [CHAR LIMIT=100] -->
    <string name="security_settings_fingerprint_bad_calibration">Please recalibrate the fingerprint sensor.</string>
    <!-- Text shown when "Add fingerprint" button is disabled -->
    <string name="fingerprint_add_max">You can add up to <xliff:g id="count" example="5">%d</xliff:g> fingerprints</string>
+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ public class FingerprintErrorDialog extends BiometricErrorDialog {
                // This message happens when the underlying crypto layer decides to revoke the
                // enrollment auth token.
                return R.string.security_settings_fingerprint_enroll_error_timeout_dialog_message;
            case FingerprintManager.FINGERPRINT_ERROR_BAD_CALIBARTION:
                return R.string.security_settings_fingerprint_bad_calibration;
            default:
                // There's nothing specific to tell the user about. Ask them to try again.
                return R.string.security_settings_fingerprint_enroll_error_generic_dialog_message;