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

Merge "Change cancel button type to skip for SUW" into qt-r1-dev am: ff01d52d50

Browse Source 
am: 006edb1f6d

Change-Id: Id8701b96d5fa1418cf020339d8b8b11a6ae07388
This commit is contained in:
joshmccloskey
2019-09-09 23:26:12 -07:00
committed by android-build-merger
parent 5a7ae4f046 006edb1f6d
commit 99278c0528
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,15 +47,25 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
mFaceManager = Utils.getFaceManagerOrNull(this); mFaceManager = Utils.getFaceManagerOrNull(this);
mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
mFooterBarMixin.setSecondaryButton( mFooterBarMixin.setSecondaryButton(
new FooterButton.Builder(this) new FooterButton.Builder(this)
.setText(R.string.security_settings_face_enroll_introduction_no_thanks) .setText(R.string.security_settings_face_enroll_introduction_no_thanks)
.setListener(this::onCancelButtonClick) .setListener(this::onSkipButtonClick)
.setButtonType(FooterButton.ButtonType.CANCEL) .setButtonType(FooterButton.ButtonType.SKIP)
.setTheme(R.style.SudGlifButton_Secondary) .setTheme(R.style.SudGlifButton_Secondary)
.build() .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( mFooterBarMixin.setPrimaryButton(
new FooterButton.Builder(this) new FooterButton.Builder(this)