am 029e147b: am 4dcabc96: Added touch slop for horizontal scrolling

* commit '029e147b33e99d28f3aa70105eff8ed684bdefe0':
  Added touch slop for horizontal scrolling

1 files changed, 8 insertions, 3 deletions

diff --git a/src/com/android/calendar/DayView.java b/src/com/android/calendar/DayView.java
index cd32f354..d636b8ab 100644
--- a/src/com/android/calendar/DayView.java
+++ b/src/com/android/calendar/DayView.java
@@ -471,6 +471,7 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
     private static int mMinCellHeight = 32;
     private int mScrollStartY;
     private int mPreviousDirection;
+    private static int mScaledPagingTouchSlop = 0;
 
     /**
      * Vertical distance or span between the two touch points at the start of a
@@ -768,6 +769,7 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
         mEdgeEffectTop = new EdgeEffect(context);
         mEdgeEffectBottom = new EdgeEffect(context);
         ViewConfiguration vc = ViewConfiguration.get(context);
+        mScaledPagingTouchSlop = vc.getScaledPagingTouchSlop();
         mOnDownDelay = ViewConfiguration.getTapTimeout();
         OVERFLING_DISTANCE = vc.getScaledOverflingDistance();
 
@@ -3990,9 +3992,12 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
             mPreviousDirection = 0;
 
             if (absDistanceX > absDistanceY) {
-                mTouchMode = TOUCH_MODE_HSCROLL;
-                mViewStartX = distanceX;
-                initNextView(-mViewStartX);
+                int slopFactor = mScaleGestureDetector.isInProgress() ? 20 : 2;
+                if (absDistanceX > mScaledPagingTouchSlop * slopFactor) {
+                    mTouchMode = TOUCH_MODE_HSCROLL;
+                    mViewStartX = distanceX;
+                    initNextView(-mViewStartX);
+                }
             } else {
                 mTouchMode = TOUCH_MODE_VSCROLL;
             }