Merge "Announce changes in keyguard message, e.g. bad unlock pattern." into jb-mr1-dev

This commit is contained in:
Svetoslav Ganov
2012-10-03 20:21:19 -07:00
committed by Android (Google) Code Review

View File

@@ -42,11 +42,13 @@ public class KeyguardNavigationManager {
public void setMessage(CharSequence msg) {
mMessageArea.setText(msg);
mMessageArea.announceForAccessibility(mMessageArea.getText());
}
public void setMessage(int resId) {
if (resId != 0) {
mMessageArea.setText(resId);
mMessageArea.announceForAccessibility(mMessageArea.getText());
} else {
mMessageArea.setText("");
}
@@ -55,6 +57,7 @@ public class KeyguardNavigationManager {
public void setMessage(int resId, Object... formatArgs) {
if (resId != 0) {
mMessageArea.setText(mMessageArea.getContext().getString(resId, formatArgs));
mMessageArea.announceForAccessibility(mMessageArea.getText());
} else {
mMessageArea.setText("");
}