From cf8e9af588772f4fac510d1e5105a68eb29f3ffa Mon Sep 17 00:00:00 2001 From: joshmccloskey Date: Thu, 23 May 2019 13:19:00 -0700 Subject: [PATCH] Added different button for non SUW enrollment Bug: 133416320 Test: Manual. Change-Id: I7087d5d4aa8f41e8d357f6fb41774d1bc62c17d9 --- .../biometrics/face/FaceEnrollEducation.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java index 956ba49d6be..8d3841162c3 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java @@ -101,14 +101,26 @@ public class FaceEnrollEducation extends BiometricEnrollBase { mDescriptionText = findViewById(R.id.sud_layout_description); mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); - mFooterBarMixin.setSecondaryButton( - new FooterButton.Builder(this) - .setText(R.string.security_settings_face_enroll_enrolling_skip) - .setListener(this::onSkipButtonClick) - .setButtonType(FooterButton.ButtonType.SKIP) - .setTheme(R.style.SudGlifButton_Secondary) - .build() - ); + + if (WizardManagerHelper.isAnySetupWizard(getIntent())) { + mFooterBarMixin.setSecondaryButton( + new FooterButton.Builder(this) + .setText(R.string.skip_label) + .setListener(this::onSkipButtonClick) + .setButtonType(FooterButton.ButtonType.SKIP) + .setTheme(R.style.SudGlifButton_Secondary) + .build() + ); + } else { + mFooterBarMixin.setSecondaryButton( + new FooterButton.Builder(this) + .setText(R.string.security_settings_face_enroll_introduction_cancel) + .setListener(this::onSkipButtonClick) + .setButtonType(FooterButton.ButtonType.CANCEL) + .setTheme(R.style.SudGlifButton_Secondary) + .build() + ); + } final FooterButton footerButton = new FooterButton.Builder(this) .setText(R.string.security_settings_face_enroll_education_start)