commit 1c9fc3e9eb7cde565efbf41c305289db577f9d40
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jan 03 07:20:19 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 03 07:20:19 2019 +0000
tree 91ea55709702a156d28b0f8a49440b0f643aa82d
parent f0c2cc44666eb8c04fb9cd9049da45f975ae5cf8
parent 71724ae03c47909e4d8a7bae00ffa68d68795171

Merge "Show "Done" button to prevent user from getting stuck"

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 0ddc1fc..798c188 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
@@ -150,7 +150,8 @@
             getNextButton().setVisibility(View.VISIBLE);
         } else {
             mErrorText.setText(errorMsg);
-            getNextButton().setVisibility(View.GONE);
+            getNextButton().setText(getResources().getString(R.string.done));
+            getNextButton().setVisibility(View.VISIBLE);
         }
     }
 
@@ -162,8 +163,13 @@
 
     @Override
     protected void onNextButtonClick(View view) {
-        // Lock thingy is already set up, launch directly to the next page
-        launchNextEnrollingActivity(mToken);
+        if (checkMaxEnrolled() == 0) {
+            // Lock thingy is already set up, launch directly to the next page
+            launchNextEnrollingActivity(mToken);
+        } else {
+            setResult(RESULT_FINISHED);
+            finish();
+        }
     }
 
     private void launchChooseLock() {