From 1c2423f36b23fca3e78f170848e0585c7e1d4660 Mon Sep 17 00:00:00 2001 From: Diya Bera Date: Wed, 25 Jan 2023 00:35:36 +0000 Subject: [PATCH] Added string to encourage user to enroll more fingerprints Test: Manual - Finish enrolling a fingerprint and check the message displayed Bug: 265023475 Change-Id: I77a6bd08a5bfb58971539bf4d366d0425ae0c9a0 --- res/values/strings.xml | 12 ++++++++++++ .../fingerprint/FingerprintEnrollFinish.java | 17 +++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index c861ed9c3c8..7fa870093b3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -870,6 +870,18 @@ Enrolling fingerprint %d percent Fingerprint added + + Now you can use your fingerprint to unlock your tablet or verify it\u2019s you, like when you sign in to apps or approve a purchase + + Now you can use your fingerprint to unlock your device or verify it\u2019s you, like when you sign in to apps or approve a purchase + + Now you can use your fingerprint to unlock your phone or verify it\u2019s you, like when you sign in to apps or approve a purchase + + Now you can use your fingerprint to unlock your tablet or verify it\u2019s you, like when you sign in to apps or approve a purchase. \n\nAdd another fingerprint so it\u2019s easier to unlock when you hold your tablet in different ways. + + Now you can use your fingerprint to unlock your device or verify it\u2019s you, like when you sign in to apps or approve a purchase.\n\nAdd another fingerprint so it\u2019s easier to unlock when you hold your device in different ways. + + Now you can use your fingerprint to unlock your phone or verify it\u2019s you, like when you sign in to apps or approve a purchase.\n\nAdd another fingerprint so it\u2019s easier to unlock when you hold your phone in different ways. Touch to unlock anytime diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java index 2125d52cde8..bbaa3c7b489 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java @@ -70,6 +70,9 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { } setHeaderText(R.string.security_settings_fingerprint_enroll_finish_title); setDescriptionText(R.string.security_settings_fingerprint_enroll_finish_v2_message); + if (mCanAssumeSfps) { + setDescriptionForSfps(); + } mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); mFooterBarMixin.setSecondaryButton( @@ -90,6 +93,20 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { ); } + private void setDescriptionForSfps() { + final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(this); + if (fpm != null) { + final List props = + fpm.getSensorPropertiesInternal(); + final int maxEnrollments = props.get(0).maxEnrollmentsPerUser; + final int enrolled = fpm.getEnrolledFingerprints(mUserId).size(); + if (enrolled < maxEnrollments) { + setDescriptionText(R.string + .security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message); + } + } + } + @Override public void onBackPressed() { updateFingerprintSuggestionEnableState();