From 65d570447641d1575aa59d511591402e431fdd2e Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Thu, 8 Sep 2011 12:18:14 -0700
Subject: [PATCH] Fix bug 5249855 - put content descriptions for action bar
 tabs on images

Change-Id: Iddf13e310237cffe517697b3c3ca429a1555dcbc
---
 .../android/internal/widget/ScrollingTabContainerView.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/widget/ScrollingTabContainerView.java b/core/java/com/android/internal/widget/ScrollingTabContainerView.java
index 5baed75e58db7..b7bc36644cb61 100644
--- 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());
+                }
             }
         }