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

Commit 4c3ac9b9 authored by Diya Bera's avatar Diya Bera Committed by Android (Google) Code Review
Browse files

Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev

parents 36e41dc9 5faf4eeb

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -745,6 +745,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 title shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->

    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1">You\u2019re in control</string>

    <!-- Introduction title shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->

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

+8 −0
Original line number Diff line number Diff line
@@ -450,6 +450,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 {
@@ -458,6 +462,10 @@ public class FingerprintSettings extends SubSettings { 
                        R.string.security_settings_fingerprint_enroll_introduction_v3_message,

                        DeviceHelper.getDeviceName(getActivity()));

                column.mLearnMoreClickListener = learnMoreClickListener;

                if (isSfps()) {

                    column.mLearnMoreOverrideText = getText(

                            R.string.security_settings_fingerprint_settings_footer_learn_more);

                }

                mFooterColumns.add(column);

            }

        }