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

Commit f3012c64 authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde 

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



Change-Id: Ic8b8eea0c25961ccc05b3d344161e1a194104b3e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents afa29d5c 47cedbde

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1042,6 +1042,8 @@ 
    <string name="security_settings_fingerprint_enroll_consent_introduction_title">Allow fingerprint unlock</string>

    <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature, when fingerprint unlock is disabled by device admin [CHAR LIMIT=40] -->

    <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled">Use your fingerprint</string>

    <!-- Learn more text of footer preference for fingerprint settings [CHAR LIMIT=NONE] -->

    <string name="security_settings_fingerprint_settings_footer_learn_more">Learn more about Fingerprint Unlock</string>

    <!-- Introduction detail message shown in fingerprint enrollment dialog (tablet) [CHAR LIMIT=NONE]-->

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

    <!-- Introduction detail message shown in fingerprint enrollment dialog (device) [CHAR LIMIT=NONE]-->

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

+8 −0
Original line number Diff line number Diff line
@@ -442,6 +442,10 @@ public class FingerprintSettings extends SubSettings { 
                column2.mTitle = getText(

                        R.string.security_fingerprint_disclaimer_lockscreen_disabled_2

                );

                if (isSfps()) {

                    column2.mLearnMoreOverrideText = getText(

                            R.string.security_settings_fingerprint_settings_footer_learn_more);

                }

                column2.mLearnMoreClickListener = learnMoreClickListener;

                mFooterColumns.add(column2);

            } else {
@@ -449,6 +453,10 @@ public class FingerprintSettings extends SubSettings { 
                column.mTitle = getText(

                        R.string.security_settings_fingerprint_enroll_introduction_v2_message);

                column.mLearnMoreClickListener = learnMoreClickListener;

                if (isSfps()) {

                    column.mLearnMoreOverrideText = getText(

                            R.string.security_settings_fingerprint_settings_footer_learn_more);

                }

                mFooterColumns.add(column);

            }

        }