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

Make Face enroll left button "Skip" during SUW

Browse Source 
Test: Manual
Bug: 120797018
Change-Id: I5539fc3e3fa9f5ffc7413f8bd44504ee1e5c4c86
This commit is contained in:
Maurice Lam
2019-03-08 13:07:39 -08:00
parent 0962a4615f
commit c14a5863ca
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(); finish();
} }
protected void onSkipButtonClick(View view) {
setResult(RESULT_SKIP);
finish();
}
@Override @Override
protected void initViews() { protected void initViews() {
super.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); mSwitchDiversity = findViewById(R.id.toggle_diversity);
mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
mFooterBarMixin.setSecondaryButton( if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
new FooterButton.Builder(this) mFooterBarMixin.setSecondaryButton(
.setText(R.string.security_settings_face_enroll_introduction_cancel) new FooterButton.Builder(this)
.setListener(this::onCancelButtonClick) .setText(R.string.skip_label)
.setButtonType(FooterButton.ButtonType.SKIP) .setListener(this::onSkipButtonClick)
.setTheme(R.style.SudGlifButton_Secondary) .setButtonType(FooterButton.ButtonType.SKIP)
.build() .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( mFooterBarMixin.setPrimaryButton(
new FooterButton.Builder(this) new FooterButton.Builder(this)