Merge "Announce changes in keyguard message, e.g. bad unlock pattern." into jb-mr1-dev
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java
index 4f29825..646ab92 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java
@@ -42,11 +42,13 @@
 
     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 void setMessage(int resId, Object... formatArgs) {
         if (resId != 0) {
             mMessageArea.setText(mMessageArea.getContext().getString(resId, formatArgs));
+            mMessageArea.announceForAccessibility(mMessageArea.getText());
         } else {
             mMessageArea.setText("");
         }