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 tm-qpr-dev am: 47cedbde0a

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

Change-Id: Ic8b8eea0c25961ccc05b3d344161e1a194104b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Diya Bera
2023-03-03 01:26:01 +00:00
committed by Automerger Merge Worker
parent afa29d5cb8 47cedbde0a
commit f3012c6497
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

@@ -1042,6 +1042,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 detail message shown in fingerprint enrollment dialog (tablet) [CHAR LIMIT=NONE]--> <!-- 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> <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]--> <!-- Introduction detail message shown in fingerprint enrollment dialog (device) [CHAR LIMIT=NONE]-->

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

@@ -442,6 +442,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 {
@@ -449,6 +453,10 @@ public class FingerprintSettings extends SubSettings {
column.mTitle = getText( column.mTitle = getText(
R.string.security_settings_fingerprint_enroll_introduction_v2_message); R.string.security_settings_fingerprint_enroll_introduction_v2_message);
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);
} }
} }