Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3d8f2f4..3d47ad4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1150,13 +1150,6 @@
<!-- Acquire message received during fingerprint enrollment to inform the user they've reached the maximum number of enrollments. [CHAR LIMIT=NONE]-->
<string name="security_settings_fingerprint_v2_enroll_error_max_attempts">You\u2019ve reached the maximum number of attempts</string>
- <!-- Message text only shown in fingerprint security settings home screen. (tablet) [CHAR LIMIT=NONE]-->
- <string name="security_settings_fingerprint_v2_home_screen_text" product="tablet">Use your fingerprint to unlock your tablet or verify it\u2019s you, like when you sign in to apps</string>
- <!-- Message text only shown in fingerprint security settings home screen. (device) [CHAR LIMIT=NONE]-->
- <string name="security_settings_fingerprint_v2_home_screen_text" product="device">Use your fingerprint to unlock your device or verify it\u2019s you, like when you sign in to apps</string>
- <!-- Message text only shown in fingerprint security settings home screen. (phone) [CHAR LIMIT=NONE]-->
- <string name="security_settings_fingerprint_v2_home_screen_text" product="default">Use your fingerprint to unlock your phone or verify it\u2019s you, like when you sign in to apps</string>
-
<!-- Biometric settings --><skip />
<!-- Title shown for menu item that launches biometric settings. [CHAR LIMIT=66] -->
<string name="security_settings_biometric_preference_title">Face & Fingerprint Unlock</string>
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 8ba2010..bbb4f45 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -446,7 +446,8 @@
mFooterColumns.add(column2);
} else {
final FooterColumn column = new FooterColumn();
- column.mTitle = getText(R.string.security_settings_fingerprint_v2_home_screen_text);
+ column.mTitle = getText(
+ R.string.security_settings_fingerprint_enroll_introduction_v2_message);
column.mLearnMoreClickListener = learnMoreClickListener;
mFooterColumns.add(column);
}