Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-10-03 20:21:19 -07:00
committed by Android (Google) Code Review
parent 09d1cb3fb1 1a1918a5a6
commit d211767f9c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java
View File

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