commit b06d95fc79389ce49dc97ecaae23e05d931a6ac2
author Michael Jurka <mikejurka@google.com> Mon Apr 02 06:26:53 2012 -0700
committer Michael Jurka <mikejurka@google.com> Tue Apr 03 04:23:05 2012 -0700
tree 03040602c1b5b33dccc38d9e8acdb6af3ded6077
parent e49eafc2294765672ed56c2b05818c532d571bb0

Fix bug where overscroll never fully snapped back

Bug: 6085652
Bug: 6065523

Change-Id: Iaac5705e00e08882beba0cad7ee0d339de31444a

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 8a2a5a0..604e73c 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -396,7 +396,9 @@
     protected boolean computeScrollHelper() {
         if (mScroller.computeScrollOffset()) {
             // Don't bother scrolling if the page does not need to be moved
-            if (mScrollX != mScroller.getCurrX() || mScrollY != mScroller.getCurrY()) {
+            if (mScrollX != mScroller.getCurrX()
+                || mScrollY != mScroller.getCurrY()
+                || mOverScrollX != mScroller.getCurrX()) {
                 scrollTo(mScroller.getCurrX(), mScroller.getCurrY());
             }
             invalidate();
@@ -755,9 +757,11 @@
         int screenCenter = mOverScrollX + halfScreenSize;
 
         if (screenCenter != mLastScreenCenter || mForceScreenScrolled) {
+            // set mForceScreenScrolled before calling screenScrolled so that screenScrolled can
+            // set it for the next frame
+            mForceScreenScrolled = false;
             screenScrolled(screenCenter);
             mLastScreenCenter = screenCenter;
-            mForceScreenScrolled = false;
         }
 
         // Find out which screens are visible; as an optimization we only call draw on them