Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c90da9fd authored by Jason Chang's avatar Jason Chang Committed by Android (Google) Code Review
Browse files

Revert "Fix Biometric Face & Fingerprint Introduction's Primary "More" button" 

This reverts commit a3313f96.

Reason for revert: 

Change-Id: I9637735a6c4e7484572bc4fb58cf7c618f62a920
parent a3313f96

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

+1 −8
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
        requireScrollMixin.requireScrollWithButton(this, getPrimaryFooterButton(),

                getMoreButtonTextRes(), this::onNextButtonClick);

        if (!isExpressiveStyle) {

            final int theme = com.google.android.setupdesign.R.style.SudGlifButton_Primary;

            requireScrollMixin.setOnRequireScrollStateChangedListener(

                    scrollNeeded -> {

                        boolean enrollmentCompleted = checkMaxEnrolled() != 0;
@@ -245,13 +244,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
                            final int primaryButtonTextRes = scrollNeeded

                                    ? getMoreButtonTextRes()

                                    : getAgreeButtonTextRes();

                            final FooterButton primaryButton = new FooterButton.Builder(this)

                                    .setText(primaryButtonTextRes)

                                    .setButtonType(FooterButton.ButtonType.OPT_IN)

                                    .setListener(this::onNextButtonClick)

                                    .setTheme(theme)

                                    .build();

                            mFooterBarMixin.setPrimaryButton(primaryButton);

                            getPrimaryFooterButton().setText(this, primaryButtonTextRes);

                        }



                        // Show secondary button once scroll is completed.