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

Merge "Make Face enroll left button "Skip" during SUW"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-09 02:51:17 +00:00
committed by Android (Google) Code Review
parent 26650e773b c14a5863ca
commit 21a818f18a
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
View File

@@ -257,6 +257,11 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
finish();
}
protected void onSkipButtonClick(View view) {
setResult(RESULT_SKIP);
finish();
}
@Override
protected void initViews() {
super.initViews();

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

@@ -60,14 +60,25 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
mSwitchDiversity = findViewById(R.id.toggle_diversity);
mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
mFooterBarMixin.setSecondaryButton(
new FooterButton.Builder(this)
.setText(R.string.security_settings_face_enroll_introduction_cancel)
.setListener(this::onCancelButtonClick)
.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::onCancelButtonClick)
.setButtonType(FooterButton.ButtonType.CANCEL)
.setTheme(R.style.SudGlifButton_Secondary)
.build()
);
}
mFooterBarMixin.setPrimaryButton(
new FooterButton.Builder(this)