Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread (d0725eef) · Commits · e / os / android_frameworks_base

core/java/android/widget/HorizontalScrollView.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -502,8 +502,10 @@ public class HorizontalScrollView extends FrameLayout {

		switch (action & MotionEvent.ACTION_MASK) {
		case MotionEvent.ACTION_DOWN: {
		final float x = ev.getX();
		mIsBeingDragged = true;
		mIsBeingDragged = getChildCount() != 0;
		if (!mIsBeingDragged) {
		return false;
		}

		/*
		* If being flinged and user touches, stop the fling. isFinished
		@@ -514,7 +516,7 @@ public class HorizontalScrollView extends FrameLayout {
		}

		// Remember where the motion event started
		mLastMotionX = x;
		mLastMotionX = ev.getX();
		mActivePointerId = ev.getPointerId(0);
		break;
		}

+6 −4

Original line number	Diff line number	Diff line
		@@ -497,8 +497,10 @@ public class ScrollView extends FrameLayout {

		switch (action & MotionEvent.ACTION_MASK) {
		case MotionEvent.ACTION_DOWN: {
		final float y = ev.getY();
		mIsBeingDragged = true;
		mIsBeingDragged = getChildCount() != 0;
		if (!mIsBeingDragged) {
		return false;
		}

		/*
		* If being flinged and user touches, stop the fling. isFinished
		@@ -509,7 +511,7 @@ public class ScrollView extends FrameLayout {
		}

		// Remember where the motion event started
		mLastMotionY = y;
		mLastMotionY = ev.getY();
		mActivePointerId = ev.getPointerId(0);
		break;
		}