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/KeyguardSimPinView.java | |
| parent | 905e807ee255e4e6f59d04ef0fba9a7cf4eabb20 (diff) | |
| parent | db327e9f5976f8f184ae105e672ea4bda4a0af48 (diff) | |
Merge "Keyguard: Clean up security message display"
Diffstat (limited to 'packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java index d48cc9479c95..839d3cec5e96 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java @@ -92,7 +92,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { color = info.getIconTint(); } } - mSecurityMessageDisplay.setMessage(msg, true); + mSecurityMessageDisplay.setMessage(msg); mSimImageView.setImageTintList(ColorStateList.valueOf(color)); } } @@ -141,7 +141,6 @@ public class KeyguardSimPinView 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); } @@ -252,7 +251,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { if (entry.length() < 4) { // otherwise, display a message to the user, and don't submit. - mSecurityMessageDisplay.setMessage(R.string.kg_invalid_sim_pin_hint, true); + mSecurityMessageDisplay.setMessage(R.string.kg_invalid_sim_pin_hint); resetPasswordText(true /* animate */, true /* announce */); mCallback.userActivity(); return; @@ -284,13 +283,13 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { } else { // show message mSecurityMessageDisplay.setMessage( - getPinPasswordErrorMessage(attemptsRemaining), true); + getPinPasswordErrorMessage(attemptsRemaining)); } } else { // "PIN operation failed!" - no idea what this was and no way to // find out. :/ mSecurityMessageDisplay.setMessage(getContext().getString( - R.string.kg_password_pin_failed), true); + R.string.kg_password_pin_failed)); } if (DEBUG) Log.d(LOG_TAG, "verifyPasswordAndUnlock " + " CheckSimPin.onSimCheckResponse: " + result |