Merge pull request #857 from hansonchris/hansonchris/horizontalScrollFix

In SlidingUpPanelLayout.dispatchTouchEvent(), ignore horizontal scrolls

Author: tokudu

library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java

@@ -207,6 +207,7 @@ public enum PanelState {
      */
     private boolean mIsTouchEnabled;
 
+    private float mPrevMotionX;
     private float mPrevMotionY;
     private float mInitialMotionX;
     private float mInitialMotionY;
@@ -961,15 +962,24 @@ public boolean dispatchTouchEvent(MotionEvent ev) {
             return super.dispatchTouchEvent(ev);
         }
 
+        final float x = ev.getX();
         final float y = ev.getY();
 
         if (action == MotionEvent.ACTION_DOWN) {
             mIsScrollableViewHandlingTouch = false;
+            mPrevMotionX = x;
             mPrevMotionY = y;
         } else if (action == MotionEvent.ACTION_MOVE) {
+            float dx = x - mPrevMotionX;
             float dy = y - mPrevMotionY;
+            mPrevMotionX = x;
             mPrevMotionY = y;
 
+            if (Math.abs(dx) > Math.abs(dy)) {
+                // Scrolling horizontally, so ignore
+                return super.dispatchTouchEvent(ev);
+            }
+
             // If the scroll view isn't under the touch, pass the
             // event along to the dragView.
             if (!isViewUnder(mScrollableView, (int) mInitialMotionX, (int) mInitialMotionY)) {