From 405a426a36ad3e94eab3cf90ca4fcd840cac4277 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Wed, 28 Feb 2018 17:52:34 -0800
Subject: [PATCH] ChooseLockPassword should not show "confirm" until min length
 is met

Fixes: 70561465

Test: manual test with setting pin/pw
Change-Id: I545202f508fa7b1a73b9a2e66a8f8216deba7555
---
 src/com/android/settings/password/ChooseLockPassword.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index 14c8877c688..38fdbcec003 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -885,7 +885,7 @@ public class ChooseLockPassword extends SettingsActivity {
                 // 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);