diff options
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardPINView.java | 6 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPINView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPINView.java index 1255712c985a..b7d9990e98e0 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPINView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPINView.java @@ -42,7 +42,11 @@ public class KeyguardPINView extends KeyguardAbsKeyInputView } 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); } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java index 6b3446add9a1..82cb44baa945 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java @@ -182,7 +182,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit 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 class KeyguardPatternView extends LinearLayout implements KeyguardSecurit } + 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 class KeyguardPatternView extends LinearLayout implements KeyguardSecurit @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) { |