Keyguard: Clean up security message display
- Remove timinig out of messages. This is no longer
necessary because we do not show the owner and charging
info in that area anymore.
- Remove the "important" parameter, which was equivalent to
clearing the message if false.
Change-Id: I5fae5432724ad90a68f53f678f933c4a15dc6e9b
Fixes: 28270749
Test: manual; reboot device, swipe up, verify message doesn't disappear after 5s
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java
index 766eab7..704e4dd 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java
@@ -175,7 +175,7 @@
}
}
if (timeoutMs == 0) {
- mSecurityMessageDisplay.setMessage(getWrongPasswordStringId(), true);
+ mSecurityMessageDisplay.setMessage(getWrongPasswordStringId());
}
}
resetPasswordText(true /* animate */, !matched /* announce deletion if no match */);
@@ -195,13 +195,13 @@
@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();
@@ -211,7 +211,7 @@
if (mCallback != null) {
mCallback.userActivity();
}
- mSecurityMessageDisplay.setMessage("", false);
+ mSecurityMessageDisplay.setMessage("");
}
@Override
@@ -248,8 +248,7 @@
if (reason != PROMPT_REASON_NONE) {
int promtReasonStringRes = getPromtReasonStringRes(reason);
if (promtReasonStringRes != 0) {
- mSecurityMessageDisplay.setMessage(promtReasonStringRes,
- true /* important */);
+ mSecurityMessageDisplay.setMessage(promtReasonStringRes);
}
}
}
@@ -257,7 +256,7 @@
@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);
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java b/packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java
index c8adf64..caeb74c 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java
@@ -41,14 +41,10 @@
private static final long ANNOUNCEMENT_DELAY = 250;
private static final int DEFAULT_COLOR = -1;
- private static final int SECURITY_MESSAGE_DURATION = 5000;
-
private final KeyguardUpdateMonitor mUpdateMonitor;
private final Handler mHandler;
private final int mDefaultColor;
- // Timeout before we reset the message to show charging/owner info
- long mTimeout = SECURITY_MESSAGE_DURATION;
CharSequence mMessage;
private int mNextMessageColor = DEFAULT_COLOR;
@@ -91,8 +87,8 @@
}
@Override
- public void setMessage(CharSequence msg, boolean important) {
- if (!TextUtils.isEmpty(msg) && important) {
+ public void setMessage(CharSequence msg) {
+ if (!TextUtils.isEmpty(msg)) {
securityMessageChanged(msg);
} else {
clearMessage();
@@ -100,28 +96,21 @@
}
@Override
- public void setMessage(int resId, boolean important) {
- if (resId != 0 && important) {
- CharSequence message = getContext().getResources().getText(resId);
- securityMessageChanged(message);
- } else {
- clearMessage();
+ public void setMessage(int resId) {
+ CharSequence message = null;
+ if (resId != 0) {
+ message = getContext().getResources().getText(resId);
}
+ setMessage(message);
}
@Override
- public void setMessage(int resId, boolean important, Object... formatArgs) {
- if (resId != 0 && important) {
- String message = getContext().getString(resId, formatArgs);
- securityMessageChanged(message);
- } else {
- clearMessage();
+ public void formatMessage(int resId, Object... formatArgs) {
+ CharSequence message = null;
+ if (resId != 0) {
+ message = getContext().getString(resId, formatArgs);
}
- }
-
- @Override
- public void setTimeout(int timeoutMs) {
- mTimeout = timeoutMs;
+ setMessage(message);
}
public static SecurityMessageDisplay findSecurityMessageDisplay(View v) {
@@ -142,10 +131,6 @@
private void securityMessageChanged(CharSequence message) {
mMessage = message;
update();
- mHandler.removeCallbacks(mClearMessageRunnable);
- if (mTimeout > 0) {
- mHandler.postDelayed(mClearMessageRunnable, mTimeout);
- }
mHandler.removeCallbacksAndMessages(ANNOUNCE_TOKEN);
mHandler.postAtTime(new AnnounceRunnable(this, getText()), ANNOUNCE_TOKEN,
(SystemClock.uptimeMillis() + ANNOUNCEMENT_DELAY));
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
index 285b1ae..590d8d5 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
@@ -67,7 +67,7 @@
@Override
protected void resetState() {
super.resetState();
- mSecurityMessageDisplay.setMessage(R.string.kg_pin_instructions, false);
+ mSecurityMessageDisplay.setMessage("");
}
@Override
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
index ddccc14..d49ff97 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java
@@ -79,7 +79,7 @@
@Override
protected void resetState() {
- mSecurityMessageDisplay.setMessage(R.string.kg_password_instructions, false);
+ mSecurityMessageDisplay.setMessage("");
final boolean wasDisabled = mPasswordEntry.isEnabled();
setPasswordEntryEnabled(true);
setPasswordEntryInputEnabled(true);
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
index 7d1a6fb..c9caefb 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
@@ -197,7 +197,7 @@
}
private void displayDefaultSecurityMessage() {
- mSecurityMessageDisplay.setMessage(R.string.kg_pattern_instructions, false);
+ mSecurityMessageDisplay.setMessage("");
}
@Override
@@ -216,7 +216,7 @@
@Override
public void onPatternStart() {
mLockPatternView.removeCallbacks(mCancelPatternRunnable);
- mSecurityMessageDisplay.setMessage("", false);
+ mSecurityMessageDisplay.setMessage("");
}
@Override
@@ -289,7 +289,7 @@
}
}
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);
}
}
@@ -306,8 +306,8 @@
@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
@@ -350,26 +350,21 @@
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;
}
}
@@ -377,7 +372,7 @@
@Override
public void showMessage(String message, int color) {
mSecurityMessageDisplay.setNextMessageColor(color);
- mSecurityMessageDisplay.setMessage(message, true /* important */);
+ mSecurityMessageDisplay.setMessage(message);
}
@Override
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
index d48cc94..839d3ce 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
@@ -92,7 +92,7 @@
color = info.getIconTint();
}
}
- mSecurityMessageDisplay.setMessage(msg, true);
+ mSecurityMessageDisplay.setMessage(msg);
mSimImageView.setImageTintList(ColorStateList.valueOf(color));
}
}
@@ -141,7 +141,6 @@
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 @@
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 @@
} 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
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java
index 249dde8..3871448 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java
@@ -108,7 +108,7 @@
}
resetPasswordText(true /* animate */, true /* announce */);
if (msg != 0) {
- mSecurityMessageDisplay.setMessage(msg, true);
+ mSecurityMessageDisplay.setMessage(msg);
}
}
@@ -133,7 +133,7 @@
color = info.getIconTint();
}
}
- mSecurityMessageDisplay.setMessage(msg, true);
+ mSecurityMessageDisplay.setMessage(msg);
mSimImageView.setImageTintList(ColorStateList.valueOf(color));
}
mPasswordEntry.requestFocus();
@@ -184,7 +184,6 @@
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 @@
} 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: "
diff --git a/packages/Keyguard/src/com/android/keyguard/SecurityMessageDisplay.java b/packages/Keyguard/src/com/android/keyguard/SecurityMessageDisplay.java
index ddb1f6e..6977b51 100644
--- a/packages/Keyguard/src/com/android/keyguard/SecurityMessageDisplay.java
+++ b/packages/Keyguard/src/com/android/keyguard/SecurityMessageDisplay.java
@@ -20,11 +20,9 @@
void setNextMessageColor(int color);
- void setMessage(CharSequence msg, boolean important);
+ void setMessage(CharSequence msg);
- void setMessage(int resId, boolean important);
+ void setMessage(int resId);
- void setMessage(int resId, boolean important, Object... formatArgs);
-
- void setTimeout(int timeout_ms);
+ void formatMessage(int resId, Object... formatArgs);
}