Updated UDFPS strings.

Test: Manual.
Fixes: 226490774
Change-Id: I6aeed72ab87e9b8b937f1acda12499c9af87462c
This commit is contained in:
Joshua Mccloskey
2022-03-28 21:52:24 +00:00
parent c397470a4d
commit ec589193c3
6 changed files with 71 additions and 5 deletions

View File

@@ -376,7 +376,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
break;
case STAGE_LEFT_EDGE:
setHeaderText(R.string.security_settings_udfps_enroll_edge_title);
setHeaderText(R.string.security_settings_udfps_enroll_left_edge_title);
if (!mHaveShownUdfpsLeftEdgeLottie && mIllustrationLottie != null) {
mHaveShownUdfpsLeftEdgeLottie = true;
setDescriptionText("");
@@ -395,7 +395,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
}
break;
case STAGE_RIGHT_EDGE:
setHeaderText(R.string.security_settings_udfps_enroll_edge_title);
setHeaderText(R.string.security_settings_udfps_enroll_right_edge_title);
if (!mHaveShownUdfpsRightEdgeLottie && mIllustrationLottie != null) {
mHaveShownUdfpsRightEdgeLottie = true;
setDescriptionText("");

View File

@@ -91,10 +91,12 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
final TextView footerMessage3 = findViewById(R.id.footer_message_3);
final TextView footerMessage4 = findViewById(R.id.footer_message_4);
final TextView footerMessage5 = findViewById(R.id.footer_message_5);
final TextView footerMessage6 = findViewById(R.id.footer_message_6);
footerMessage2.setText(getFooterMessage2());
footerMessage3.setText(getFooterMessage3());
footerMessage4.setText(getFooterMessage4());
footerMessage5.setText(getFooterMessage5());
footerMessage6.setText(getFooterMessage6());
final TextView footerTitle1 = findViewById(R.id.footer_title_1);
final TextView footerTitle2 = findViewById(R.id.footer_title_2);
@@ -163,6 +165,11 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_5;
}
@StringRes
protected int getFooterMessage6() {
return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_6;
}
@Override
protected boolean isDisabledByAdmin() {
return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(

View File

@@ -44,7 +44,8 @@ public class FingerprintEnrollParentalConsent extends FingerprintEnrollIntroduct
R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2,
R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3,
R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4,
R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5
R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5,
R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6
};
@Override
@@ -116,6 +117,11 @@ public class FingerprintEnrollParentalConsent extends FingerprintEnrollIntroduct
return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5;
}
@StringRes
protected int getFooterMessage6() {
return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6;
}
@Override
protected int getHeaderResDefault() {
return R.string.security_settings_fingerprint_enroll_consent_introduction_title;