diff options
| author | joshmccloskey <joshmccloskey@google.com> | 2019-09-09 16:11:27 -0700 |
|---|---|---|
| committer | joshmccloskey <joshmccloskey@google.com> | 2019-09-09 16:46:03 -0700 |
| commit | d98257bae6e6fbb756aa71addc6e3e07dfcb94d3 (patch) | |
| tree | 8aaa34650ba5bd299bab1998fb6561a466f786f1 /src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java | |
| parent | a55cbf036f7448e7b17e4cbc16a094bd4095c2fa (diff) | |
| download | packages_apps_Settings-d98257bae6e6fbb756aa71addc6e3e07dfcb94d3.tar.gz packages_apps_Settings-d98257bae6e6fbb756aa71addc6e3e07dfcb94d3.tar.bz2 packages_apps_Settings-d98257bae6e6fbb756aa71addc6e3e07dfcb94d3.zip | |
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
Diffstat (limited to 'src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java')
| -rw-r--r-- | src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java | 28 |
1 files changed, 19 insertions, 9 deletions
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) |