diff --git a/res/values/strings.xml b/res/values/strings.xml index 7fb0b2c769b..9cdbad75d15 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -838,6 +838,12 @@ Use your face to unlock your phone, authorize purchases, or sign in to apps. + Allow your child to use their face to unlock their phone + + Allow your child to use their face to unlock their tablet + + Allow your child to use their face to unlock their device + Using your child\u2019s face to unlock their phone may be less secure than a strong pattern or PIN. Using your child\u2019s face to unlock their tablet may be less secure than a strong pattern or PIN. @@ -858,6 +864,8 @@ + + diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java index aa081bd82dc..a8be8f7e1a9 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java @@ -115,11 +115,13 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { final TextView howMessage = findViewById(R.id.how_message); final TextView inControlTitle = findViewById(R.id.title_in_control); final TextView inControlMessage = findViewById(R.id.message_in_control); + final TextView lessSecure = findViewById(R.id.info_message_less_secure); infoMessageGlasses.setText(getInfoMessageGlasses()); infoMessageLooking.setText(getInfoMessageLooking()); inControlTitle.setText(getInControlTitle()); howMessage.setText(getHowMessage()); inControlMessage.setText(getInControlMessage()); + lessSecure.setText(getLessSecureMessage()); // Set up and show the "less secure" info section if necessary. if (getResources().getBoolean(R.bool.config_face_intro_show_less_secure)) { @@ -227,6 +229,11 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { return R.string.security_settings_face_enroll_introduction_control_message; } + @StringRes + protected int getLessSecureMessage() { + return R.string.security_settings_face_enroll_introduction_info_less_secure; + } + @Override protected boolean isDisabledByAdmin() { return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled( diff --git a/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java b/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java index 54466f90f0a..0f384c2ffcc 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java @@ -45,14 +45,19 @@ public class FaceEnrollParentalConsent extends FaceEnrollIntroduction { R.string.security_settings_face_enroll_introduction_info_consent_gaze, R.string.security_settings_face_enroll_introduction_how_consent_message, R.string.security_settings_face_enroll_introduction_control_consent_title, - R.string.security_settings_face_enroll_introduction_control_consent_message + R.string.security_settings_face_enroll_introduction_control_consent_message, + R.string.security_settings_face_enroll_introduction_consent_message_0, + R.string.security_settings_face_enroll_introduction_info_consent_less_secure }; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - setDescriptionText(R.string.security_settings_face_enroll_introduction_consent_message); + final String text = + getText(R.string.security_settings_face_enroll_introduction_consent_message_0) + + "\n\n" + + getText(R.string.security_settings_face_enroll_introduction_consent_message); + setDescriptionText(text); } @Override @@ -134,6 +139,11 @@ public class FaceEnrollParentalConsent extends FaceEnrollIntroduction { return R.string.security_settings_face_enroll_consent_introduction_title; } + @Override + protected int getLessSecureMessage() { + return R.string.security_settings_face_enroll_introduction_info_consent_less_secure; + } + @Override public int getMetricsCategory() { return SettingsEnums.FACE_PARENTAL_CONSENT;