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

Commit 57c6df71 authored by Grace Cheng's avatar Grace Cheng
Browse files

[conflict] Merge "Update fingerprint enrollment finished string" into... 

[conflict] Merge "Update fingerprint enrollment finished string" into tm-qpr-dev am: e4b09e55 am: aa3465b8

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



Change-Id: I355e42fb9ea5bafe62006e152c52cd04cd62e109
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a2c5d06 aa3465b8

res/values/strings.xml

+6 −2
Original line number Diff line number Diff line
@@ -797,8 +797,12 @@ 
    <string name="security_settings_udfps_enroll_progress_a11y_message">Enrolling fingerprint <xliff:g id="percentage" example="10">%d</xliff:g> percent</string>

    <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->

    <string name="security_settings_fingerprint_enroll_finish_title">Fingerprint added</string>

    <!-- Message shown in SFPS enrollment dialog once enrollment is completed [CHAR LIMIT=NONE] -->

    <string name="security_settings_sfps_enroll_finish">Now you can use your fingerprint to unlock your tablet or verify it\u2019s you, like when you sign in to apps or approve a purchase</string>

    <!-- Message shown in fingerprint enrollment dialog once enrollment is completed (tablet) [CHAR LIMIT=NONE] -->

    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet">Now you can use your fingerprint to unlock your tablet or verify it\u2019s you, like when you sign in to apps or approve a purchase</string>

    <!-- Message shown in fingerprint enrollment dialog once enrollment is completed (device) [CHAR LIMIT=NONE] -->

    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device">Now you can use your fingerprint to unlock your device or verify it\u2019s you, like when you sign in to apps or approve a purchase</string>

    <!-- Message shown in fingerprint enrollment dialog once enrollment is completed (default) [CHAR LIMIT=NONE] -->

    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default">Now you can use your fingerprint to unlock your phone or verify it\u2019s you, like when you sign in to apps or approve a purchase</string>

    <!-- Title for require screen on to auth toggle shown in fingerprint enrollment dialog once enrollment is completed. [CHAR LIMIT=NONE] -->

    <string name="security_settings_require_screen_on_to_auth_title">Unlock only when screen is on</string>

    <!-- Description for require screen on to auth toggle shown in fingerprint enrollment dialog once enrollment is completed. [CHAR LIMIT=NONE] -->

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

+1 −5
Original line number Diff line number Diff line
@@ -69,11 +69,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { 
            setContentView(R.layout.fingerprint_enroll_finish);

        }

        setHeaderText(R.string.security_settings_fingerprint_enroll_finish_title);

        if (mCanAssumeSfps) {

            setDescriptionText(R.string.security_settings_sfps_enroll_finish);

        } else {

        setDescriptionText(R.string.security_settings_fingerprint_enroll_finish_v2_message);

        }



        mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);

        mFooterBarMixin.setSecondaryButton(