summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/View.java
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-10-11 10:57:40 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-11 10:57:41 -0700
commit9aefa1457967b52f1865173aa70896db84f111f1 (patch)
tree92ff5b5059a8489b37bf84bee6263edb291ecbab /core/java/android/view/View.java
parent092ad66a571d95cad20003daeac4c1119352b854 (diff)
parentb708f7703b98e14f01311dbc93e2636abe4790c9 (diff)
downloadframeworks_base-9aefa1457967b52f1865173aa70896db84f111f1.zip
frameworks_base-9aefa1457967b52f1865173aa70896db84f111f1.tar.gz
frameworks_base-9aefa1457967b52f1865173aa70896db84f111f1.tar.bz2
Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev
Diffstat (limited to 'core/java/android/view/View.java')
-rw-r--r--core/java/android/view/View.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 22243b1..608bdd7 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -5214,11 +5214,19 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*/
@RemotableViewMethod
public void setContentDescription(CharSequence contentDescription) {
+ if (mContentDescription == null) {
+ if (contentDescription == null) {
+ return;
+ }
+ } else if (mContentDescription.equals(contentDescription)) {
+ return;
+ }
mContentDescription = contentDescription;
final boolean nonEmptyDesc = contentDescription != null && contentDescription.length() > 0;
if (nonEmptyDesc && getImportantForAccessibility() == IMPORTANT_FOR_ACCESSIBILITY_AUTO) {
setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);
}
+ notifyAccessibilityStateChanged();
}
/**