Added face unicorn strings

Test: Manual.
Fixes: 234663447
Change-Id: I57f0b52f645655647db38c58da2c158e63221c18
This commit is contained in:
Joshua McCloskey
2022-06-15 20:56:00 +00:00
committed by Joshua Mccloskey
parent dc3e340774
commit 66211d15bf
3 changed files with 28 additions and 3 deletions

View File

@@ -838,6 +838,12 @@
<!-- Introduction detail message shown in face enrollment dialog [CHAR LIMIT=NONE]--> <!-- Introduction detail message shown in face enrollment dialog [CHAR LIMIT=NONE]-->
<string name="security_settings_face_enroll_introduction_message">Use your face to unlock your phone, authorize purchases, or sign in to apps.</string> <string name="security_settings_face_enroll_introduction_message">Use your face to unlock your phone, authorize purchases, or sign in to apps.</string>
<!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]--> <!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->
<string name="security_settings_face_enroll_introduction_consent_message_0" product="default">Allow your child to use their face to unlock their phone</string>
<!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->
<string name="security_settings_face_enroll_introduction_consent_message_0" product="tablet">Allow your child to use their face to unlock their tablet</string>
<!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->
<string name="security_settings_face_enroll_introduction_consent_message_0" product="device">Allow your child to use their face to unlock their device</string>
<!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->
<string name="security_settings_face_enroll_introduction_consent_message" product="default">Using your child\u2019s face to unlock their phone may be less secure than a strong pattern or PIN.</string> <string name="security_settings_face_enroll_introduction_consent_message" product="default">Using your child\u2019s face to unlock their phone may be less secure than a strong pattern or PIN.</string>
<!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]--> <!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->
<string name="security_settings_face_enroll_introduction_consent_message" product="tablet">Using your child\u2019s face to unlock their tablet may be less secure than a strong pattern or PIN.</string> <string name="security_settings_face_enroll_introduction_consent_message" product="tablet">Using your child\u2019s face to unlock their tablet may be less secure than a strong pattern or PIN.</string>
@@ -858,6 +864,8 @@
<!-- Message on the face enrollment introduction page that provides information about what could cause the phone to unlock when asking for parental consent. [CHAR LIMIT=NONE] --> <!-- Message on the face enrollment introduction page that provides information about what could cause the phone to unlock when asking for parental consent. [CHAR LIMIT=NONE] -->
<string name="security_settings_face_enroll_introduction_info_consent_looking"></string> <string name="security_settings_face_enroll_introduction_info_consent_looking"></string>
<!-- Message on the face enrollment introduction page that provides information about the relative security of face for unlocking the phone. [CHAR LIMIT=NONE] --> <!-- Message on the face enrollment introduction page that provides information about the relative security of face for unlocking the phone. [CHAR LIMIT=NONE] -->
<string name="security_settings_face_enroll_introduction_info_consent_less_secure"></string>
<!-- Message on the face enrollment introduction page that provides information about the relative security of face for unlocking the phone for parental consent. [CHAR LIMIT=NONE] -->
<string name="security_settings_face_enroll_introduction_info_less_secure"></string> <string name="security_settings_face_enroll_introduction_info_less_secure"></string>
<!-- Message on the face enrollment introduction page that provides information about how to require eyes to be open for Face Unlock. [CHAR LIMIT=NONE] --> <!-- Message on the face enrollment introduction page that provides information about how to require eyes to be open for Face Unlock. [CHAR LIMIT=NONE] -->
<string name="security_settings_face_enroll_introduction_info_gaze"></string> <string name="security_settings_face_enroll_introduction_info_gaze"></string>

View File

@@ -115,11 +115,13 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
final TextView howMessage = findViewById(R.id.how_message); final TextView howMessage = findViewById(R.id.how_message);
final TextView inControlTitle = findViewById(R.id.title_in_control); final TextView inControlTitle = findViewById(R.id.title_in_control);
final TextView inControlMessage = findViewById(R.id.message_in_control); final TextView inControlMessage = findViewById(R.id.message_in_control);
final TextView lessSecure = findViewById(R.id.info_message_less_secure);
infoMessageGlasses.setText(getInfoMessageGlasses()); infoMessageGlasses.setText(getInfoMessageGlasses());
infoMessageLooking.setText(getInfoMessageLooking()); infoMessageLooking.setText(getInfoMessageLooking());
inControlTitle.setText(getInControlTitle()); inControlTitle.setText(getInControlTitle());
howMessage.setText(getHowMessage()); howMessage.setText(getHowMessage());
inControlMessage.setText(getInControlMessage()); inControlMessage.setText(getInControlMessage());
lessSecure.setText(getLessSecureMessage());
// Set up and show the "less secure" info section if necessary. // Set up and show the "less secure" info section if necessary.
if (getResources().getBoolean(R.bool.config_face_intro_show_less_secure)) { 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; 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 @Override
protected boolean isDisabledByAdmin() { protected boolean isDisabledByAdmin() {
return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled( return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(

View File

@@ -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_info_consent_gaze,
R.string.security_settings_face_enroll_introduction_how_consent_message, 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_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 @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
final String text =
setDescriptionText(R.string.security_settings_face_enroll_introduction_consent_message); 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 @Override
@@ -134,6 +139,11 @@ public class FaceEnrollParentalConsent extends FaceEnrollIntroduction {
return R.string.security_settings_face_enroll_consent_introduction_title; 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 @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return SettingsEnums.FACE_PARENTAL_CONSENT; return SettingsEnums.FACE_PARENTAL_CONSENT;