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

* commit '2c9669320f6eb7227dd66fb8fe6cce3d39a56f06': Fix for ActionBar#setSelectedNavigationItem() in collapsed tab mode
2013-04-09 16:43:36 -07:00
parent a66a77fc16 2c9669320f
commit 3431f7ed15
1 changed files with 3 additions and 0 deletions
--- 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) {