Merge "Fix for ActionBar#setSelectedNavigationItem() in collapsed tab mode" into jb-mr2-dev

1 files changed, 3 insertions, 0 deletions

diff --git a/core/java/com/android/internal/widget/ScrollingTabContainerView.java b/core/java/com/android/internal/widget/ScrollingTabContainerView.java
index b6205689bcec..04931e726bb7 100644
--- a/core/java/com/android/internal/widget/ScrollingTabContainerView.java
+++ b/core/java/com/android/internal/widget/ScrollingTabContainerView.java
@@ -179,6 +179,9 @@ public class ScrollingTabContainerView extends HorizontalScrollView
                 animateToTab(position);
             }
         }
+        if (mTabSpinner != null && position >= 0) {
+            mTabSpinner.setSelection(position);
+        }
     }
 
     public void setContentHeight(int contentHeight) {