From ec589193c328a4bd6fdb325b1588cc1a39c693f2 Mon Sep 17 00:00:00 2001 From: Joshua Mccloskey Date: Mon, 28 Mar 2022 21:52:24 +0000 Subject: [PATCH] Updated UDFPS strings. Test: Manual. Fixes: 226490774 Change-Id: I6aeed72ab87e9b8b937f1acda12499c9af87462c --- res/drawable/ic_guarantee.xml | 26 +++++++++++++++++++ .../fingerprint_enroll_introduction.xml | 21 +++++++++++++++ res/values/strings.xml | 10 +++++-- .../FingerprintEnrollEnrolling.java | 4 +-- .../FingerprintEnrollIntroduction.java | 7 +++++ .../FingerprintEnrollParentalConsent.java | 8 +++++- 6 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 res/drawable/ic_guarantee.xml diff --git a/res/drawable/ic_guarantee.xml b/res/drawable/ic_guarantee.xml new file mode 100644 index 00000000000..7aa61243de0 --- /dev/null +++ b/res/drawable/ic_guarantee.xml @@ -0,0 +1,26 @@ + + + + \ No newline at end of file diff --git a/res/layout/fingerprint_enroll_introduction.xml b/res/layout/fingerprint_enroll_introduction.xml index d4914e64bbb..aaed5be01d3 100644 --- a/res/layout/fingerprint_enroll_introduction.xml +++ b/res/layout/fingerprint_enroll_introduction.xml @@ -165,6 +165,27 @@ style="@style/BiometricEnrollIntroMessage" /> + + + + + + + Your phone can be unlocked when you don\u2019t intend to, like if someone holds it up to your finger. Your child\u2019s phone can be unlocked when they don\u2019t intend to, like if someone holds it up to their finger. + + For best results, use a screen protector that\u2019s Made for Google certified. With other screen protectors, your fingerprint may not work. + + For best results, use a screen protector that\u2019s Made for Google certified. With other screen protectors, your child\u2019s fingerprint may not work. @@ -1120,8 +1124,10 @@ Touch & hold each time the fingerprint icon moves. This helps capture more of your fingerprint. Place the tip of your finger on the sensor - - Finally, use the edges of your finger + + Place the left edge of your finger + + Place the right edge of your finger Place the side of your fingerprint on the sensor and hold, then switch to the other side diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index 70140c42c8c..a6806e02db2 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -376,7 +376,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { break; case STAGE_LEFT_EDGE: - setHeaderText(R.string.security_settings_udfps_enroll_edge_title); + setHeaderText(R.string.security_settings_udfps_enroll_left_edge_title); if (!mHaveShownUdfpsLeftEdgeLottie && mIllustrationLottie != null) { mHaveShownUdfpsLeftEdgeLottie = true; setDescriptionText(""); @@ -395,7 +395,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { } break; case STAGE_RIGHT_EDGE: - setHeaderText(R.string.security_settings_udfps_enroll_edge_title); + setHeaderText(R.string.security_settings_udfps_enroll_right_edge_title); if (!mHaveShownUdfpsRightEdgeLottie && mIllustrationLottie != null) { mHaveShownUdfpsRightEdgeLottie = true; setDescriptionText(""); diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index 82b76c3e33d..6fe14e6a9cd 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java @@ -91,10 +91,12 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { final TextView footerMessage3 = findViewById(R.id.footer_message_3); final TextView footerMessage4 = findViewById(R.id.footer_message_4); final TextView footerMessage5 = findViewById(R.id.footer_message_5); + final TextView footerMessage6 = findViewById(R.id.footer_message_6); footerMessage2.setText(getFooterMessage2()); footerMessage3.setText(getFooterMessage3()); footerMessage4.setText(getFooterMessage4()); footerMessage5.setText(getFooterMessage5()); + footerMessage6.setText(getFooterMessage6()); final TextView footerTitle1 = findViewById(R.id.footer_title_1); final TextView footerTitle2 = findViewById(R.id.footer_title_2); @@ -163,6 +165,11 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_5; } + @StringRes + protected int getFooterMessage6() { + return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_6; + } + @Override protected boolean isDisabledByAdmin() { return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled( diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java index 22212f27d83..c33ae175a09 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java @@ -44,7 +44,8 @@ public class FingerprintEnrollParentalConsent extends FingerprintEnrollIntroduct R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2, R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3, R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4, - R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5 + R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5, + R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6 }; @Override @@ -116,6 +117,11 @@ public class FingerprintEnrollParentalConsent extends FingerprintEnrollIntroduct return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5; } + @StringRes + protected int getFooterMessage6() { + return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6; + } + @Override protected int getHeaderResDefault() { return R.string.security_settings_fingerprint_enroll_consent_introduction_title;