commit e00a14b14ccaba440cab4026c241a1e850d4168a
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 01 04:45:25 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 01 04:45:25 2018 +0000
tree aee2bb47f0aaa7f4651cd6634b46363bd4b875d7
parent bb2dc211fc1fe58da6868cb4700a2462576329c3
parent 405a426a36ad3e94eab3cf90ca4fcd840cac4277

Merge "ChooseLockPassword should not show "confirm" until min length is met"

src/com/android/settings/password/ChooseLockPassword.java

diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index 14c8877..38fdbce 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -885,7 +885,7 @@
                 // Hide password requirement view when we are just asking user to confirm the pw.
                 mPasswordRestrictionView.setVisibility(View.GONE);
                 setHeaderText(getString(mUiStage.getHint(mIsAlphaMode, mForFingerprint)));
-                setNextEnabled(canInput && length > 0);
+                setNextEnabled(canInput && length >= mPasswordMinLength);
                 mClearButton.setEnabled(canInput && length > 0);
             }
             int message = mUiStage.getMessage(mIsAlphaMode, mForFingerprint);