Merge "Showing message when max attempts are hit in face unlock fixes b/7306168" into jb-mr1-lockscreen-dev

Author: Danielle Millett

policy/src/com/android/internal/policy/impl/keyguard/KeyguardPINView.java

@@ -42,7 +42,11 @@ public KeyguardPINView(Context context, AttributeSet attrs) {
     }
 
     protected void resetState() {
-        mSecurityMessageDisplay.setMessage(R.string.kg_pin_instructions, false);
+        if (KeyguardUpdateMonitor.getInstance(mContext).getMaxBiometricUnlockAttemptsReached()) {
+            mSecurityMessageDisplay.setMessage(R.string.faceunlock_multiple_failures, true);
+        } else {
+            mSecurityMessageDisplay.setMessage(R.string.kg_pin_instructions, false);
+        }
         mPasswordEntry.setEnabled(true);
     }
 

policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java

@@ -182,7 +182,7 @@ public void reset() {
         if (deadline != 0) {
             handleAttemptLockout(deadline);
         } else {
-            mSecurityMessageDisplay.setMessage(R.string.kg_pattern_instructions, false);
+            displayDefaultSecurityMessage();
         }
 
         // the footer depends on how many total attempts the user has failed
@@ -197,6 +197,14 @@ public void reset() {
 
     }
 
+    private void displayDefaultSecurityMessage() {
+        if (KeyguardUpdateMonitor.getInstance(mContext).getMaxBiometricUnlockAttemptsReached()) {
+            mSecurityMessageDisplay.setMessage(R.string.faceunlock_multiple_failures, true);
+        } else {
+            mSecurityMessageDisplay.setMessage(R.string.kg_pattern_instructions, false);
+        }
+    }
+
     @Override
     public void showUsabilityHint() {
     }
@@ -338,7 +346,7 @@ public void onTick(long millisUntilFinished) {
             @Override
             public void onFinish() {
                 mLockPatternView.setEnabled(true);
-                mSecurityMessageDisplay.setMessage(R.string.kg_pattern_instructions, false);
+                displayDefaultSecurityMessage();
                 // TODO mUnlockIcon.setVisibility(View.VISIBLE);
                 mFailedPatternAttemptsSinceLastTimeout = 0;
                 if (mEnableFallback) {