am 7700a764: Merge "Fixing workspace scrolling, Bug: 4070816" into honeycomb-mr1

* commit '7700a7648ad1073d4f1f1afd94bf554732edf49b':
  Fixing workspace scrolling, Bug: 4070816

1 files changed, 4 insertions, 0 deletions

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 26ea4a812..e7ecb9914 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -738,6 +738,7 @@ public abstract class PagedView extends ViewGroup {
          * If we return true, onTouchEvent will be called and we do the actual
          * scrolling there.
          */
+        acquireVelocityTrackerAndAddMovement(ev);
 
         // Skip touch handling if there are no pages to swipe
         if (getChildCount() <= 0) return super.onInterceptTouchEvent(ev);
@@ -816,10 +817,12 @@ public abstract class PagedView extends ViewGroup {
                 mTouchState = TOUCH_STATE_REST;
                 mAllowLongPress = false;
                 mActivePointerId = INVALID_POINTER;
+                releaseVelocityTracker();
                 break;
 
             case MotionEvent.ACTION_POINTER_UP:
                 onSecondaryPointerUp(ev);
+                releaseVelocityTracker();
                 break;
         }
 
@@ -871,6 +874,7 @@ public abstract class PagedView extends ViewGroup {
             if (mUsePagingTouchSlop ? xPaged : xMoved) {
                 // Scroll if the user moved far enough along the X axis
                 mTouchState = TOUCH_STATE_SCROLLING;
+                mTotalMotionX += Math.abs(mLastMotionX - x);
                 mLastMotionX = x;
                 mLastMotionXRemainder = 0;
                 mTouchX = mScrollX;