commit dd6c09123c2341a51fb285936cfffef48c594356
author Michael Jurka <mikejurka@google.com> Mon Jan 16 06:46:20 2012 -0800
committer Michael Jurka <mikejurka@google.com> Tue Jan 17 12:12:18 2012 -0800
tree 6714ff2a5ab428af7558e12b5151d27a5331e2d3
parent e3517d01ecb844b498d5862df07bc2177861806a

Fix occasional odd scrolling behavior

Change-Id: I4cbcd17ab0bc2212d9591098d9aac6ca3ce6ed7d

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index c72fdcc..2edfb34 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -292,6 +292,7 @@
         int newX = getChildOffset(mCurrentPage) - getRelativeChildOffset(mCurrentPage);
         scrollTo(newX, 0);
         mScroller.setFinalX(newX);
+        mScroller.forceFinished(true);
     }
 
     /**
@@ -602,9 +603,7 @@
 
         if (mFirstLayout && mCurrentPage >= 0 && mCurrentPage < getChildCount()) {
             setHorizontalScrollBarEnabled(false);
-            int newX = getChildOffset(mCurrentPage) - getRelativeChildOffset(mCurrentPage);
-            scrollTo(newX, 0);
-            mScroller.setFinalX(newX);
+            updateCurrentPageScroll();
             setHorizontalScrollBarEnabled(true);
             mFirstLayout = false;
         }