Merge "Granular navigation not possible in edit text if the view has content description." into jb-mr1-dev

sganov · Android (Google) Code Review · commit 52832e0c4f35 · 2012-09-06T19:14:31.000-07:00
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
@@ -8355,7 +8355,7 @@ private void createEditorIfNeeded() {
      */
     @Override
     public CharSequence getIterableTextForAccessibility() {
-        if (getContentDescription() == null) {
+        if (!TextUtils.isEmpty(mText)) {
             if (!(mText instanceof Spannable)) {
                 setText(mText, BufferType.SPANNABLE);
             }

Original file line number	Diff line number	Diff line change
`@@ -8355,7 +8355,7 @@ private void createEditorIfNeeded() {`
`8355`	`8355`	`*/`
`8356`	`8356`	`@Override`
`8357`	`8357`	`public CharSequence getIterableTextForAccessibility() {`
`8358`		`- if (getContentDescription() == null) {`
	`8358`	`+ if (!TextUtils.isEmpty(mText)) {`
`8359`	`8359`	`if (!(mText instanceof Spannable)) {`
`8360`	`8360`	`setText(mText, BufferType.SPANNABLE);`
`8361`	`8361`	`}`