From d98257bae6e6fbb756aa71addc6e3e07dfcb94d3 Mon Sep 17 00:00:00 2001 From: joshmccloskey Date: Mon, 9 Sep 2019 16:11:27 -0700 Subject: Change cancel button type to skip for SUW Test: Verified in SUW that enrollment will skip after tapping the cancel button in the Introduction. Fixes: 140702414 Change-Id: I9d9da0ff6d10b6ee6929cb52ff4a03a684f43d17 --- .../biometrics/face/FaceEnrollIntroduction.java | 28 +++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java') diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java index e092891368..965b8ed6db 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java @@ -47,15 +47,25 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { mFaceManager = Utils.getFaceManagerOrNull(this); mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); - - mFooterBarMixin.setSecondaryButton( - new FooterButton.Builder(this) - .setText(R.string.security_settings_face_enroll_introduction_no_thanks) - .setListener(this::onCancelButtonClick) - .setButtonType(FooterButton.ButtonType.CANCEL) - .setTheme(R.style.SudGlifButton_Secondary) - .build() - ); + if (WizardManagerHelper.isAnySetupWizard(getIntent())) { + mFooterBarMixin.setSecondaryButton( + new FooterButton.Builder(this) + .setText(R.string.security_settings_face_enroll_introduction_no_thanks) + .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_no_thanks) + .setListener(this::onCancelButtonClick) + .setButtonType(FooterButton.ButtonType.CANCEL) + .setTheme(R.style.SudGlifButton_Secondary) + .build() + ); + } mFooterBarMixin.setPrimaryButton( new FooterButton.Builder(this) -- cgit v1.2.3