1 files changed, 11 insertions, 4 deletions
diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java
index 6f76dd0..31ec785 100644
--- a/core/java/android/widget/TabWidget.java
+++ b/core/java/android/widget/TabWidget.java
@@ -427,12 +427,19 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener {
 
     @Override
     public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
-        event.setItemCount(getTabCount());
-        event.setCurrentItemIndex(mSelectedTab);
+        onPopulateAccessibilityEvent(event);
+        // Dispatch only to the selected tab.
         if (mSelectedTab != -1) {
-            getChildTabViewAt(mSelectedTab).dispatchPopulateAccessibilityEvent(event);
+            return getChildTabViewAt(mSelectedTab).dispatchPopulateAccessibilityEvent(event);
         }
-        return true;
+        return false;
+    }
+
+    @Override
+    public void onPopulateAccessibilityEvent(AccessibilityEvent event) {
+        super.onPopulateAccessibilityEvent(event);
+        event.setItemCount(getTabCount());
+        event.setCurrentItemIndex(mSelectedTab);
     }
 
     /**