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

Commit cc179be2 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Fixed face enroll intro button issue" into sc-v2-dev am: 506c6b80 am: 78ab60db 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16365598

Change-Id: Ic324c6829d8dfa180ca7e0aaf5d8841c0e76dd88
parents 46101884 78ab60db

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

+9 −5
Original line number Diff line number Diff line
@@ -203,11 +203,15 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
                getMoreButtonTextRes(), this::onNextButtonClick);

        requireScrollMixin.setOnRequireScrollStateChangedListener(

                scrollNeeded -> {



                    boolean enrollmentCompleted = checkMaxEnrolled() != 0;

                    if (!enrollmentCompleted) {

                        // Update text of primary button from "More" to "Agree".

                        final int primaryButtonTextRes = scrollNeeded

                                ? getMoreButtonTextRes()

                                : getAgreeButtonTextRes();

                        getPrimaryFooterButton().setText(this, primaryButtonTextRes);

                    }



                    // Show secondary button once scroll is completed.

                    if (!scrollNeeded) {