commit 0bb301ec35dcaf2ea9c2010790d7eadb1918b8cb
author Adam Powell <adamp@google.com> Thu Jan 10 17:51:06 2013 -0800
committer Adam Powell <adamp@google.com> Thu Jan 10 17:51:25 2013 -0800
tree 1f0f6417f5d9c7d8fc22dfaa7c57036eb9c83718
parent d267c93c774c51addeb3cc6bfa64d729ce238d54

Remove cruft from ViewPager

Change-Id: I9ea9d5469db97188b85a375edc5f38cc7e9bddac

v4/java/android/support/v4/view/ViewPager.java

diff --git a/v4/java/android/support/v4/view/ViewPager.java b/v4/java/android/support/v4/view/ViewPager.java
index cc08c5e..b3bc5b7 100644
--- a/v4/java/android/support/v4/view/ViewPager.java
+++ b/v4/java/android/support/v4/view/ViewPager.java
@@ -186,8 +186,6 @@
     private int mMaximumVelocity;
     private int mFlingDistance;
     private int mCloseEnough;
-    private int mSeenPositionMin;
-    private int mSeenPositionMax;
 
     // If the pager is at least this close to its final position, complete the scroll
     // on touch down and let the user interact with the content inside instead of
@@ -386,9 +384,6 @@
         }
 
         mScrollState = newState;
-        if (newState == SCROLL_STATE_DRAGGING) {
-            mSeenPositionMin = mSeenPositionMax = -1;
-        }
         if (mPageTransformer != null) {
             // PageTransformers can do complex things that benefit from hardware layers.
             enableLayers(newState != SCROLL_STATE_IDLE);
@@ -1648,14 +1643,6 @@
             }
         }
 
-        if (mSeenPositionMin < 0 || position < mSeenPositionMin) {
-            mSeenPositionMin = position;
-        }
-        final int pageOffsetCeil = (int) FloatMath.ceil(position + offset);
-        if (mSeenPositionMax < 0 || pageOffsetCeil > mSeenPositionMax) {
-            mSeenPositionMax = pageOffsetCeil;
-        }
-
         if (mOnPageChangeListener != null) {
             mOnPageChangeListener.onPageScrolled(position, offset, offsetPixels);
         }
@@ -2084,11 +2071,6 @@
         int targetPage;
         if (Math.abs(deltaX) > mFlingDistance && Math.abs(velocity) > mMinimumVelocity) {
             targetPage = velocity > 0 ? currentPage : currentPage + 1;
-        } else if (mSeenPositionMin >= 0 && mSeenPositionMin < currentPage && pageOffset < 0.5f) {
-            targetPage = currentPage + 1;
-        } else if (mSeenPositionMax >= 0 && mSeenPositionMax > currentPage + 1 &&
-                pageOffset >= 0.5f) {
-            targetPage = currentPage - 1;
         } else {
             final float truncator = currentPage >= mCurItem ? 0.4f : 0.6f;
             targetPage = (int) (currentPage + pageOffset + truncator);