PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Diya Bera
2023-03-02 19:09:23 +00:00
committed by Android (Google) Code Review
parent 36e41dc985 5faf4eeb8e
commit 4c3ac9b994
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -745,6 +745,8 @@
<string name="security_settings_fingerprint_enroll_consent_introduction_title">Allow fingerprint unlock</string> <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] --> <!-- 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> <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]--> <!-- 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> <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]--> <!-- Introduction title shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->

8
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -450,6 +450,10 @@ public class FingerprintSettings extends SubSettings {
column2.mTitle = getText( column2.mTitle = getText(
R.string.security_fingerprint_disclaimer_lockscreen_disabled_2 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; column2.mLearnMoreClickListener = learnMoreClickListener;
mFooterColumns.add(column2); mFooterColumns.add(column2);
} else { } else {
@@ -458,6 +462,10 @@ public class FingerprintSettings extends SubSettings {
R.string.security_settings_fingerprint_enroll_introduction_v3_message, R.string.security_settings_fingerprint_enroll_introduction_v3_message,
DeviceHelper.getDeviceName(getActivity())); DeviceHelper.getDeviceName(getActivity()));
column.mLearnMoreClickListener = learnMoreClickListener; column.mLearnMoreClickListener = learnMoreClickListener;
if (isSfps()) {
column.mLearnMoreOverrideText = getText(
R.string.security_settings_fingerprint_settings_footer_learn_more);
}
mFooterColumns.add(column); mFooterColumns.add(column);
} }
} }