commit 09c1552341d76f9963eb18245887d86c4d00301f
author Winson Chung <winsonc@google.com> Fri Sep 09 11:44:31 2011 -0700
committer Winson Chung <winsonc@google.com> Fri Sep 09 11:45:50 2011 -0700
tree a76d6631f4dddd4eb0ff0b87cd1550163a94d9d7
parent a1c7ff12192b3bf670f7870f22b0f9b8ed161289

Bounding scroll bar to the track to prevent overscrolling.

Change-Id: I2db815e072dcf41dda8102829d136fc2dca588e7

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 807470c..9f9450c 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -1776,11 +1776,13 @@
         int numPages = getChildCount();
         int pageWidth = getMeasuredWidth();
         int maxPageWidth = (numPages * getChildWidth(0)) + ((numPages - 1) * mPageSpacing);
+        int maxScrollPosition = maxPageWidth - pageWidth; // n-1 * pageWidth
         int trackWidth = pageWidth - mScrollIndicatorPaddingLeft - mScrollIndicatorPaddingRight;
         int indicatorWidth = mScrollIndicator.getMeasuredWidth() -
                 mScrollIndicator.getPaddingLeft() - mScrollIndicator.getPaddingRight();
 
-        float offset = (float) getScrollX() / maxPageWidth;
+        float offset = (float) Math.max(0f, Math.min(maxScrollPosition, getScrollX()))
+                / maxPageWidth;
         int indicatorSpace = trackWidth / numPages;
         int indicatorPos = (int) (offset * trackWidth) + mScrollIndicatorPaddingLeft;
         if (hasElasticScrollIndicator()) {