commit f44fb4de5d7b461244448c3fa82ec7806f50e651
author Svetoslav Ganov <svetoslavganov@google.com> Tue Jul 03 11:29:28 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 03 11:29:28 2012 -0700
tree 4b415928e5cbb457355b744b0741d9a45a052a37
parent a78c7d78ec0162946f982e0207de93ea5876a3aa
parent 7a82b2be0674cc9c925c6892aa8a534896e277f9

Merge "AnnounceForAccessibility is broken for any view that has a ContentDescription."

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index b6f0aa2..56eb628 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -4496,11 +4496,13 @@
      * @param text The announcement text.
      */
     public void announceForAccessibility(CharSequence text) {
-        if (AccessibilityManager.getInstance(mContext).isEnabled()) {
+        if (AccessibilityManager.getInstance(mContext).isEnabled() && mParent != null) {
             AccessibilityEvent event = AccessibilityEvent.obtain(
                     AccessibilityEvent.TYPE_ANNOUNCEMENT);
+            onInitializeAccessibilityEvent(event);
             event.getText().add(text);
-            sendAccessibilityEventUnchecked(event);
+            event.setContentDescription(null);
+            mParent.requestSendAccessibilityEvent(this, event);
         }
     }