PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix biometrics unicorn consent string bug." into udc-dev

Browse Source
This commit is contained in:
Hao Dong
2023-04-12 18:02:16 +00:00
committed by Android (Google) Code Review
parent e4c3f68b56 08bd7960c3
commit ad5954bc94
4 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -592,6 +592,10 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
return data;
}
protected boolean isFaceStrong() {
return mIsFaceStrong;
}
private void onFaceStrengthChanged() {
// Set up and show the "less secure" info section if necessary.
if (!mIsFaceStrong && getResources().getBoolean(

15
src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java
View File

@@ -47,13 +47,14 @@ public class FaceEnrollParentalConsent extends FaceEnrollIntroduction {
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_consent_message_0,
R.string.security_settings_face_enroll_introduction_consent_message_0_class3,
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_0);
updateDescriptionText();
}
@Override
@@ -144,4 +145,16 @@ public class FaceEnrollParentalConsent extends FaceEnrollIntroduction {
public int getMetricsCategory() {
return SettingsEnums.FACE_PARENTAL_CONSENT;
}
@Override
protected void updateDescriptionText() {
super.updateDescriptionText();
if (isFaceStrong()) {
setDescriptionText(getString(
R.string.security_settings_face_enroll_introduction_consent_message_0_class3));
} else {
setDescriptionText(
R.string.security_settings_face_enroll_introduction_consent_message_0);
}
}
}

8
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java
View File

@@ -131,4 +131,12 @@ public class FingerprintEnrollParentalConsent extends FingerprintEnrollIntroduct
public int getMetricsCategory() {
return SettingsEnums.FINGERPRINT_PARENTAL_CONSENT;
}
@Override
protected void updateDescriptionText() {
super.updateDescriptionText();
setDescriptionText(
R.string.security_settings_fingerprint_enroll_introduction_consent_message);
}
}