Merge "Granular navigation uses mContentDescription instead of getCpontentDescription()s" into jb-mr1-dev

sganov · Android (Google) Code Review · commit 3540f1f28be4 · 2012-09-06T19:06:37.000-07:00
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
@@ -6810,7 +6810,7 @@ private boolean previousAtGranularity(int granularity) {
      * @hide
      */
     public CharSequence getIterableTextForAccessibility() {
-        return mContentDescription;
+        return getContentDescription();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -6810,7 +6810,7 @@ private boolean previousAtGranularity(int granularity) {`
`6810`	`6810`	`* @hide`
`6811`	`6811`	`*/`
`6812`	`6812`	`public CharSequence getIterableTextForAccessibility() {`
`6813`		`- return mContentDescription;`
	`6813`	`+ return getContentDescription();`
`6814`	`6814`	`}`
`6815`	`6815`
`6816`	`6816`	`/**`