Skip to content

Commit 3062112

Browse files
Adam CohenAndroid Git Automerger
Adam Cohen
authored and
Android Git Automerger
committed
am 32f9e8f: Merge "Only showing important security messages in status area (issue 7341795)" into jb-mr1-dev
* commit '32f9e8ffdd552aef550cd21c97d792b421cb12f9': Only showing important security messages in status area (issue 7341795)
2 parents 7fcc9b1 + 32f9e8f commit 3062112

File tree

8 files changed

+30
-28
lines changed

8 files changed

+30
-28
lines changed

‎policy/src/com/android/internal/policy/impl/keyguard/KeyguardAccountView.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ public void reset() {
137137
mLogin.setText("");
138138
mPassword.setText("");
139139
mLogin.requestFocus();
140-
mSecurityMessageDisplay.setMessage(mLockPatternUtils.isPermanentlyLocked() ?
141-
R.string.kg_login_too_many_attempts : R.string.kg_login_instructions);
140+
boolean permLocked = mLockPatternUtils.isPermanentlyLocked();
141+
mSecurityMessageDisplay.setMessage(permLocked ? R.string.kg_login_too_many_attempts :
142+
R.string.kg_login_instructions, permLocked ? true : false);
142143
}
143144

144145
/** {@inheritDoc} */
@@ -178,7 +179,7 @@ public void run() {
178179
// dismiss keyguard
179180
mCallback.dismiss(true);
180181
} else {
181-
mSecurityMessageDisplay.setMessage(R.string.kg_login_invalid_input);
182+
mSecurityMessageDisplay.setMessage(R.string.kg_login_invalid_input, true);
182183
mPassword.setText("");
183184
mCallback.reportFailedUnlockAttempt();
184185
}

‎policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@
1616

1717
package com.android.internal.policy.impl.keyguard;
1818

19-
import android.view.View;
2019
import android.widget.TextView;
2120

22-
import com.android.internal.R;
23-
2421
public class KeyguardNavigationManager implements SecurityMessageDisplay {
2522

2623
private TextView mMessageArea;
@@ -30,12 +27,12 @@ public KeyguardNavigationManager(TextView messageArea) {
3027
mMessageArea.setSelected(true); // Make marquee work
3128
}
3229

33-
public void setMessage(CharSequence msg) {
30+
public void setMessage(CharSequence msg, boolean important) {
3431
mMessageArea.setText(msg);
3532
mMessageArea.announceForAccessibility(mMessageArea.getText());
3633
}
3734

38-
public void setMessage(int resId) {
35+
public void setMessage(int resId, boolean important) {
3936
if (resId != 0) {
4037
mMessageArea.setText(resId);
4138
mMessageArea.announceForAccessibility(mMessageArea.getText());
@@ -44,7 +41,7 @@ public void setMessage(int resId) {
4441
}
4542
}
4643

47-
public void setMessage(int resId, Object... formatArgs) {
44+
public void setMessage(int resId, boolean important, Object... formatArgs) {
4845
if (resId != 0) {
4946
mMessageArea.setText(mMessageArea.getContext().getString(resId, formatArgs));
5047
mMessageArea.announceForAccessibility(mMessageArea.getText());

‎policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void reset() {
102102

103103
private void resetState() {
104104
mSecurityMessageDisplay.setMessage(
105-
mIsAlpha ? R.string.kg_password_instructions : R.string.kg_pin_instructions);
105+
mIsAlpha ? R.string.kg_password_instructions : R.string.kg_pin_instructions, false);
106106
mPasswordEntry.setEnabled(true);
107107
mKeyboardView.setEnabled(true);
108108
}
@@ -288,7 +288,7 @@ private void verifyPasswordAndUnlock() {
288288
handleAttemptLockout(deadline);
289289
}
290290
mSecurityMessageDisplay.setMessage(
291-
mIsAlpha ? R.string.kg_wrong_password : R.string.kg_wrong_pin);
291+
mIsAlpha ? R.string.kg_wrong_password : R.string.kg_wrong_pin, true);
292292
}
293293
mPasswordEntry.setText("");
294294
}
@@ -304,7 +304,7 @@ private void handleAttemptLockout(long elapsedRealtimeDeadline) {
304304
public void onTick(long millisUntilFinished) {
305305
int secondsRemaining = (int) (millisUntilFinished / 1000);
306306
mSecurityMessageDisplay.setMessage(
307-
R.string.kg_too_many_failed_attempts_countdown, secondsRemaining);
307+
R.string.kg_too_many_failed_attempts_countdown, true, secondsRemaining);
308308
}
309309

310310
@Override

‎policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public void reset() {
182182
if (deadline != 0) {
183183
handleAttemptLockout(deadline);
184184
} else {
185-
mSecurityMessageDisplay.setMessage(R.string.kg_pattern_instructions);
185+
mSecurityMessageDisplay.setMessage(R.string.kg_pattern_instructions, false);
186186
}
187187

188188
// the footer depends on how many total attempts the user has failed
@@ -254,7 +254,7 @@ public void onPatternDetected(List<LockPatternView.Cell> pattern) {
254254
long deadline = mLockPatternUtils.setLockoutAttemptDeadline();
255255
handleAttemptLockout(deadline);
256256
} else {
257-
mSecurityMessageDisplay.setMessage(R.string.kg_wrong_pattern);
257+
mSecurityMessageDisplay.setMessage(R.string.kg_wrong_pattern, true);
258258
mLockPatternView.postDelayed(mCancelPatternRunnable, PATTERN_CLEAR_TIMEOUT_MS);
259259
}
260260
}
@@ -327,13 +327,13 @@ private void handleAttemptLockout(long elapsedRealtimeDeadline) {
327327
public void onTick(long millisUntilFinished) {
328328
final int secondsRemaining = (int) (millisUntilFinished / 1000);
329329
mSecurityMessageDisplay.setMessage(
330-
R.string.kg_too_many_failed_attempts_countdown, secondsRemaining);
330+
R.string.kg_too_many_failed_attempts_countdown, true, secondsRemaining);
331331
}
332332

333333
@Override
334334
public void onFinish() {
335335
mLockPatternView.setEnabled(true);
336-
mSecurityMessageDisplay.setMessage(R.string.kg_pattern_instructions);
336+
mSecurityMessageDisplay.setMessage(R.string.kg_pattern_instructions, false);
337337
// TODO mUnlockIcon.setVisibility(View.VISIBLE);
338338
mFailedPatternAttemptsSinceLastTimeout = 0;
339339
if (mEnableFallback) {

‎policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPinView.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ protected boolean onRequestFocusInDescendants(int direction, Rect previouslyFocu
111111
public void reset() {
112112
// start fresh
113113
if (mSecurityMessageDisplay != null) {
114-
mSecurityMessageDisplay.setMessage(R.string.kg_sim_pin_instructions);
114+
mSecurityMessageDisplay.setMessage(R.string.kg_sim_pin_instructions, true);
115115
}
116116

117117
// make sure that the number of entered digits is consistent when we
@@ -193,7 +193,7 @@ private Dialog getSimUnlockProgressDialog() {
193193
private void checkPin() {
194194
if (mPinEntry.getText().length() < 4) {
195195
// otherwise, display a message to the user, and don't submit.
196-
mSecurityMessageDisplay.setMessage(R.string.kg_invalid_sim_pin_hint);
196+
mSecurityMessageDisplay.setMessage(R.string.kg_invalid_sim_pin_hint, true);
197197
mPinEntry.setText("");
198198
mCallback.userActivity(0);
199199
return;
@@ -216,7 +216,8 @@ public void run() {
216216
KeyguardUpdateMonitor.getInstance(getContext()).reportSimUnlocked();
217217
mCallback.dismiss(true);
218218
} else {
219-
mSecurityMessageDisplay.setMessage(R.string.kg_password_wrong_pin_code);
219+
mSecurityMessageDisplay.setMessage
220+
(R.string.kg_password_wrong_pin_code, true);
220221
mPinEntry.setText("");
221222
}
222223
mCallback.userActivity(0);

‎policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPukView.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void next() {
9999
}
100100
mSimPinEntry.setText(null);
101101
if (msg != 0) {
102-
mSecurityMessageDisplay.setMessage(msg);
102+
mSecurityMessageDisplay.setMessage(msg, true);
103103
}
104104
}
105105

@@ -108,7 +108,7 @@ void reset() {
108108
mPukText="";
109109
state = ENTER_PUK;
110110
if (mSecurityMessageDisplay != null) {
111-
mSecurityMessageDisplay.setMessage(R.string.kg_puk_enter_puk_hint);
111+
mSecurityMessageDisplay.setMessage(R.string.kg_puk_enter_puk_hint, true);
112112
}
113113
mSimPinEntry.requestFocus();
114114
}
@@ -279,7 +279,7 @@ public void run() {
279279
mCallback.dismiss(true);
280280
} else {
281281
mStateMachine.reset();
282-
mSecurityMessageDisplay.setMessage(R.string.kg_invalid_puk);
282+
mSecurityMessageDisplay.setMessage(R.string.kg_invalid_puk, true);
283283
}
284284
mCheckInProgress = false;
285285
}

‎policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,14 @@ void resetStatusInfo() {
188188
updateStatusLines();
189189
}
190190

191-
public void setMessage(CharSequence msg) {
191+
public void setMessage(CharSequence msg, boolean important) {
192+
if (!important) return;
192193
mSecurityMessageContents = msg;
193194
securityMessageChanged();
194195
}
195196

196-
public void setMessage(int resId) {
197+
public void setMessage(int resId, boolean important) {
198+
if (!important) return;
197199
if (resId != 0) {
198200
mSecurityMessageContents = getContext().getResources().getText(resId);
199201
} else {
@@ -202,7 +204,8 @@ public void setMessage(int resId) {
202204
securityMessageChanged();
203205
}
204206

205-
public void setMessage(int resId, Object... formatArgs) {
207+
public void setMessage(int resId, boolean important, Object... formatArgs) {
208+
if (!important) return;
206209
if (resId != 0) {
207210
mSecurityMessageContents = getContext().getString(resId, formatArgs);
208211
} else {

‎policy/src/com/android/internal/policy/impl/keyguard/SecurityMessageDisplay.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
package com.android.internal.policy.impl.keyguard;
1818

1919
public interface SecurityMessageDisplay {
20-
public void setMessage(CharSequence msg);
20+
public void setMessage(CharSequence msg, boolean important);
2121

22-
public void setMessage(int resId);
22+
public void setMessage(int resId, boolean important);
2323

24-
public void setMessage(int resId, Object... formatArgs);
24+
public void setMessage(int resId, boolean important, Object... formatArgs);
2525
}

0 commit comments

Comments
 (0)