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/KeyguardPatternView.java | |
| parent | 905e807ee255e4e6f59d04ef0fba9a7cf4eabb20 (diff) | |
| parent | db327e9f5976f8f184ae105e672ea4bda4a0af48 (diff) | |
Merge "Keyguard: Clean up security message display"
Diffstat (limited to 'packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java index a9ce19726c21..330632b701f1 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java @@ -200,7 +200,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit } private void displayDefaultSecurityMessage() { - mSecurityMessageDisplay.setMessage(R.string.kg_pattern_instructions, false); + mSecurityMessageDisplay.setMessage(""); } @Override @@ -219,7 +219,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit @Override public void onPatternStart() { mLockPatternView.removeCallbacks(mCancelPatternRunnable); - mSecurityMessageDisplay.setMessage("", false); + mSecurityMessageDisplay.setMessage(""); } @Override @@ -314,7 +314,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit } } if (timeoutMs == 0) { - mSecurityMessageDisplay.setMessage(R.string.kg_wrong_pattern, true); + mSecurityMessageDisplay.setMessage(R.string.kg_wrong_pattern); mLockPatternView.postDelayed(mCancelPatternRunnable, PATTERN_CLEAR_TIMEOUT_MS); } } @@ -331,8 +331,8 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit @Override public void onTick(long millisUntilFinished) { final 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 @@ -375,26 +375,21 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit public void showPromptReason(int reason) { switch (reason) { case PROMPT_REASON_RESTART: - mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_restart_pattern, - true /* important */); + mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_restart_pattern); break; case PROMPT_REASON_TIMEOUT: - mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_timeout_pattern, - true /* important */); + mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_timeout_pattern); break; case PROMPT_REASON_DEVICE_ADMIN: - mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_device_admin, - true /* important */); + mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_device_admin); break; case PROMPT_REASON_USER_REQUEST: - mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_user_request, - true /* important */); + mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_user_request); break; case PROMPT_REASON_NONE: break; default: - mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_timeout_pattern, - true /* important */); + mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_timeout_pattern); break; } } @@ -402,7 +397,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit @Override public void showMessage(String message, int color) { mSecurityMessageDisplay.setNextMessageColor(color); - mSecurityMessageDisplay.setMessage(message, true /* important */); + mSecurityMessageDisplay.setMessage(message); } @Override |