Merge "Fix nested cross-scrolling for ScrollView/HorizontalScrollView" into jb-dev

Author: adamp

core/java/android/widget/HorizontalScrollView.java

@@ -536,10 +536,15 @@ public boolean onTouchEvent(MotionEvent ev) {
 
         switch (action & MotionEvent.ACTION_MASK) {
             case MotionEvent.ACTION_DOWN: {
-                mIsBeingDragged = getChildCount() != 0;
-                if (!mIsBeingDragged) {
+                if (getChildCount() == 0) {
                     return false;
                 }
+                if ((mIsBeingDragged = !mScroller.isFinished())) {
+                    final ViewParent parent = getParent();
+                    if (parent != null) {
+                        parent.requestDisallowInterceptTouchEvent(true);
+                    }
+                }
 
                 /*
                  * If being flinged and user touches, stop the fling. isFinished
@@ -555,11 +560,23 @@ public boolean onTouchEvent(MotionEvent ev) {
                 break;
             }
             case MotionEvent.ACTION_MOVE:
+                final int activePointerIndex = ev.findPointerIndex(mActivePointerId);
+                final int x = (int) ev.getX(activePointerIndex);
+                int deltaX = mLastMotionX - x;
+                if (!mIsBeingDragged && Math.abs(deltaX) > mTouchSlop) {
+                    final ViewParent parent = getParent();
+                    if (parent != null) {
+                        parent.requestDisallowInterceptTouchEvent(true);
+                    }
+                    mIsBeingDragged = true;
+                    if (deltaX > 0) {
+                        deltaX -= mTouchSlop;
+                    } else {
+                        deltaX += mTouchSlop;
+                    }
+                }
                 if (mIsBeingDragged) {
                     // Scroll to follow the motion event
-                    final int activePointerIndex = ev.findPointerIndex(mActivePointerId);
-                    final int x = (int) ev.getX(activePointerIndex);
-                    final int deltaX = (int) (mLastMotionX - x);
                     mLastMotionX = x;
 
                     final int oldX = mScrollX;

core/java/android/widget/ScrollView.java

@@ -482,6 +482,10 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
                     if (mScrollStrictSpan == null) {
                         mScrollStrictSpan = StrictMode.enterCriticalSpan("ScrollView-scroll");
                     }
+                    final ViewParent parent = getParent();
+                    if (parent != null) {
+                        parent.requestDisallowInterceptTouchEvent(true);
+                    }
                 }
                 break;
             }
@@ -546,10 +550,15 @@ public boolean onTouchEvent(MotionEvent ev) {
 
         switch (action & MotionEvent.ACTION_MASK) {
             case MotionEvent.ACTION_DOWN: {
-                mIsBeingDragged = getChildCount() != 0;
-                if (!mIsBeingDragged) {
+                if (getChildCount() == 0) {
                     return false;
                 }
+                if ((mIsBeingDragged = !mScroller.isFinished())) {
+                    final ViewParent parent = getParent();
+                    if (parent != null) {
+                        parent.requestDisallowInterceptTouchEvent(true);
+                    }
+                }
 
                 /*
                  * If being flinged and user touches, stop the fling. isFinished
@@ -569,11 +578,23 @@ public boolean onTouchEvent(MotionEvent ev) {
                 break;
             }
             case MotionEvent.ACTION_MOVE:
+                final int activePointerIndex = ev.findPointerIndex(mActivePointerId);
+                final int y = (int) ev.getY(activePointerIndex);
+                int deltaY = mLastMotionY - y;
+                if (!mIsBeingDragged && Math.abs(deltaY) > mTouchSlop) {
+                    final ViewParent parent = getParent();
+                    if (parent != null) {
+                        parent.requestDisallowInterceptTouchEvent(true);
+                    }
+                    mIsBeingDragged = true;
+                    if (deltaY > 0) {
+                        deltaY -= mTouchSlop;
+                    } else {
+                        deltaY += mTouchSlop;
+                    }
+                }
                 if (mIsBeingDragged) {
                     // Scroll to follow the motion event
-                    final int activePointerIndex = ev.findPointerIndex(mActivePointerId);
-                    final int y = (int) ev.getY(activePointerIndex);
-                    final int deltaY = mLastMotionY - y;
                     mLastMotionY = y;
 
                     final int oldX = mScrollX;