Commit 72b7c53c authored Jul 31, 2012 by Adam Powell Committed by Android Git Automerger Jul 31, 2012

am 015b2c1e: am 8ab8fbbf: Merge "Don\'t let ScrollView intercept touch events...

am 015b2c1e: am 8ab8fbbf: Merge "Don\'t let ScrollView intercept touch events if it can\'t scroll." into jb-mr1-dev

* commit '015b2c1e':
  Don't let ScrollView intercept touch events if it can't scroll.

parents 5e78b10e 015b2c1e

core/java/android/widget/ScrollView.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -460,6 +460,13 @@ public class ScrollView extends FrameLayout {
		return true;
		}

		/*
		* Don't try to intercept touch if we can't scroll anyway.
		*/
		if (getScrollY() == 0 && !canScrollVertically(1)) {
		return false;
		}

		switch (action & MotionEvent.ACTION_MASK) {
		case MotionEvent.ACTION_MOVE: {
		/*