diff options
| author | Adrian Roos <roosa@google.com> | 2016-10-17 18:32:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-17 18:32:59 +0000 |
| commit | 2ec2019f008f435c9db611f0aaf6961d2f9e632c (patch) | |
| tree | bf1886bdc0093b6f0da4958a6e9b106b6ce06267 /packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java | |
| parent | 905e807ee255e4e6f59d04ef0fba9a7cf4eabb20 (diff) | |
| parent | db327e9f5976f8f184ae105e672ea4bda4a0af48 (diff) | |
Merge "Keyguard: Clean up security message display"
Diffstat (limited to 'packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java index 4330573877c1..94286ec6a785 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java @@ -200,7 +200,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout } } if (timeoutMs == 0) { - mSecurityMessageDisplay.setMessage(getWrongPasswordStringId(), true); + mSecurityMessageDisplay.setMessage(getWrongPasswordStringId()); } } resetPasswordText(true /* animate */, !matched /* announce deletion if no match */); @@ -220,13 +220,13 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout @Override public void onTick(long millisUntilFinished) { int secondsRemaining = (int) (millisUntilFinished / 1000); - mSecurityMessageDisplay.setMessage( - R.string.kg_too_many_failed_attempts_countdown, true, secondsRemaining); + mSecurityMessageDisplay.formatMessage( + R.string.kg_too_many_failed_attempts_countdown, secondsRemaining); } @Override public void onFinish() { - mSecurityMessageDisplay.setMessage("", false); + mSecurityMessageDisplay.setMessage(""); resetState(); } }.start(); @@ -236,7 +236,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout if (mCallback != null) { mCallback.userActivity(); } - mSecurityMessageDisplay.setMessage("", false); + mSecurityMessageDisplay.setMessage(""); } @Override @@ -273,8 +273,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout if (reason != PROMPT_REASON_NONE) { int promtReasonStringRes = getPromtReasonStringRes(reason); if (promtReasonStringRes != 0) { - mSecurityMessageDisplay.setMessage(promtReasonStringRes, - true /* important */); + mSecurityMessageDisplay.setMessage(promtReasonStringRes); } } } @@ -282,7 +281,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout @Override public void showMessage(String message, int color) { mSecurityMessageDisplay.setNextMessageColor(color); - mSecurityMessageDisplay.setMessage(message, true /* important */); + mSecurityMessageDisplay.setMessage(message); } protected abstract int getPromtReasonStringRes(int reason); |