Merge "Show "Done" button to prevent user from getting stuck" (1c9fc3e9) · Commits · e / os / android_packages_apps_Settings

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

+9 −3

Original line number	Diff line number	Diff line
		@@ -150,7 +150,8 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
		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 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase

		@Override
		protected void onNextButtonClick(View view) {
		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() {