commit 426b2e0f442e3fad3197076c9fc99ebba40b1db3
author Michael Jurka <mikejurka@google.com> Tue Jan 17 12:26:48 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 17 12:26:48 2012 -0800
tree 8b900e8c53d45064ce3497cc3a8f8e039fada23f
parent ff619ed700c3d8be23fbb25c5ef0bb06031d28e6
parent c0f21e1d3c348c6ab83c1d223e7c1c2d683412fb

am c0f21e1d: Merge "Fix occasional odd scrolling behavior"

* commit 'c0f21e1d3c348c6ab83c1d223e7c1c2d683412fb':
  Fix occasional odd scrolling behavior

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 939b7fd..acfce1f 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;
         }