Merge "Fix tab blinking while fling"
diff --git a/design/src/android/support/design/widget/TabLayout.java b/design/src/android/support/design/widget/TabLayout.java
index c041f2d..5b23fcb 100755
--- a/design/src/android/support/design/widget/TabLayout.java
+++ b/design/src/android/support/design/widget/TabLayout.java
@@ -309,6 +309,8 @@
*/
public ViewPager.OnPageChangeListener createOnPageChangeListener() {
return new ViewPager.SimpleOnPageChangeListener() {
+ private int mScrollState;
+
@Override
public void onPageScrolled(int position, float positionOffset,
int positionOffsetPixels) {
@@ -317,7 +319,14 @@
@Override
public void onPageSelected(int position) {
- getTabAt(position).select();
+ if (mScrollState == ViewPager.SCROLL_STATE_IDLE) {
+ getTabAt(position).select();
+ }
+ }
+
+ @Override
+ public void onPageScrollStateChanged(int state) {
+ mScrollState = state;
}
};
}