commit 506c6b804f5ebd1a7fc090c7a11f0f5d7820fcef
author Joshua Mccloskey <joshmccloskey@google.com> Wed Dec 01 23:08:49 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 01 23:08:49 2021 +0000
tree 1ade933b1d65aeda4a313afa504c0db6bb535c46
parent d51b41d4eca61c0608acf9a74261432a14f41f2e
parent 756fa20e1ce86dc1fa0ef72b8782b8486d3882bb

Merge "Fixed face enroll intro button issue" into sc-v2-dev

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

diff --git a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
index f80b01f..7f3bc87 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
@@ -203,11 +203,15 @@
                 getMoreButtonTextRes(), this::onNextButtonClick);
         requireScrollMixin.setOnRequireScrollStateChangedListener(
                 scrollNeeded -> {
-                    // Update text of primary button from "More" to "Agree".
-                    final int primaryButtonTextRes = scrollNeeded
-                            ? getMoreButtonTextRes()
-                            : getAgreeButtonTextRes();
-                    getPrimaryFooterButton().setText(this, primaryButtonTextRes);
+
+                    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) {