Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 8736785 from 652e9ef651 to udc-release

Browse Source 
Change-Id: I374a72720ad21ded10be38909763d1f9957611d8
This commit is contained in:
Android Build Coastguard Worker
2022-06-17 03:24:03 +00:00
parent 9ad2f3a008 652e9ef651
commit fc843c969a
3 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/strings.xml
View File

@@ -813,6 +813,12 @@
<!-- 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>
<!-- 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>
<!-- 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>
@@ -833,6 +839,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] -->
<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] -->
<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>
<!-- 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>
@@ -8465,7 +8473,7 @@
<string name="keywords_font_size">text size, large print, large font, large text, low vision, make text bigger, font enlarger, font enlargement</string>
<!-- List of synonyms for the always show time and info [CHAR LIMIT=NONE] -->
<string name="keywords_always_show_time_info">always on display</string>
<string name="keywords_always_show_time_info">always on display, AOD</string>
<!-- Option title for the default sound, context based on screen -->
<string name="default_sound">Default sound</string>

7
src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
View File

@@ -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(

16
src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java
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_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;