Merge "Fix bug 5249855 - put content descriptions for action bar tabs on images"

2011-09-08 14:01:03 -07:00
parent 3cb5559850 65d5704476
commit dceee86438
1 changed files with 3 additions and 1 deletions
--- a/core/java/com/android/internal/widget/ScrollingTabContainerView.java
+++ b/core/java/com/android/internal/widget/ScrollingTabContainerView.java
@@ -444,7 +444,9 @@ public class ScrollingTabContainerView extends HorizontalScrollView
                    mTextView.setText(null);
                }

-                setContentDescription(tab.getContentDescription());
+                if (mIconView != null) {
+                    mIconView.setContentDescription(tab.getContentDescription());
+                }
            }
        }