Merge "Stop rejecting valid flings in quick contacts" into lmp-mr1-dev
diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java
index dfec204..cf32aa1 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -389,6 +389,11 @@
@Override
public boolean onInterceptTouchEvent(MotionEvent event) {
+ if (mVelocityTracker == null) {
+ mVelocityTracker = VelocityTracker.obtain();
+ }
+ mVelocityTracker.addMovement(event);
+
// The only time we want to intercept touch events is when we are being dragged.
return shouldStartDrag(event);
}
@@ -1157,11 +1162,8 @@
}
private boolean motionShouldStartDrag(MotionEvent event) {
- final float deltaX = event.getX() - mLastEventPosition[0];
final float deltaY = event.getY() - mLastEventPosition[1];
- final boolean draggedX = (deltaX > mTouchSlop || deltaX < -mTouchSlop);
- final boolean draggedY = (deltaY > mTouchSlop || deltaY < -mTouchSlop);
- return draggedY && !draggedX;
+ return deltaY > mTouchSlop || deltaY < -mTouchSlop;
}
private float updatePositionAndComputeDelta(MotionEvent event) {