Merge "Make Face enroll left button "Skip" during SUW" (21a818f1) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/biometrics/BiometricEnrollIntroduction.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -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();

+19 −8

Original line number	Diff line number	Diff line
		@@ -60,14 +60,25 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
		mSwitchDiversity = findViewById(R.id.toggle_diversity);

		mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
		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.SKIP)
		.setButtonType(FooterButton.ButtonType.CANCEL)
		.setTheme(R.style.SudGlifButton_Secondary)
		.build()
		);
		}

		mFooterBarMixin.setPrimaryButton(
		new FooterButton.Builder(this)