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/KeyguardSimPukView.java | |
| parent | 905e807ee255e4e6f59d04ef0fba9a7cf4eabb20 (diff) | |
| parent | db327e9f5976f8f184ae105e672ea4bda4a0af48 (diff) | |
Merge "Keyguard: Clean up security message display"
Diffstat (limited to 'packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java index 249dde83a1d2..3871448cb617 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java @@ -108,7 +108,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { } resetPasswordText(true /* animate */, true /* announce */); if (msg != 0) { - mSecurityMessageDisplay.setMessage(msg, true); + mSecurityMessageDisplay.setMessage(msg); } } @@ -133,7 +133,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { color = info.getIconTint(); } } - mSecurityMessageDisplay.setMessage(msg, true); + mSecurityMessageDisplay.setMessage(msg); mSimImageView.setImageTintList(ColorStateList.valueOf(color)); } mPasswordEntry.requestFocus(); @@ -184,7 +184,6 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { protected void onFinishInflate() { super.onFinishInflate(); - mSecurityMessageDisplay.setTimeout(0); // don't show ownerinfo/charging status by default if (mEcaView instanceof EmergencyCarrierArea) { ((EmergencyCarrierArea) mEcaView).setCarrierTextVisible(true); } @@ -341,11 +340,11 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { } else { // show message mSecurityMessageDisplay.setMessage( - getPukPasswordErrorMessage(attemptsRemaining), true); + getPukPasswordErrorMessage(attemptsRemaining)); } } else { mSecurityMessageDisplay.setMessage(getContext().getString( - R.string.kg_password_puk_failed), true); + R.string.kg_password_puk_failed)); } if (DEBUG) Log.d(LOG_TAG, "verifyPasswordAndUnlock " + " UpdateSim.onSimCheckResponse: " |