diff options
Diffstat (limited to 'core/java/android/widget/ScrollView.java')
| -rw-r--r-- | core/java/android/widget/ScrollView.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index 2ba1c4791705..8472d9ce5e71 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -498,9 +498,7 @@ public class ScrollView extends FrameLayout { switch (action & MotionEvent.ACTION_MASK) { case MotionEvent.ACTION_DOWN: { final float y = ev.getY(); - if (!(mIsBeingDragged = inChild((int) ev.getX(), (int) y))) { - return false; - } + mIsBeingDragged = true; /* * If being flinged and user touches, stop the fling. isFinished @@ -637,7 +635,7 @@ public class ScrollView extends FrameLayout { if (getChildCount() > 0) { View child = getChildAt(0); scrollRange = Math.max(0, - child.getHeight() - getHeight() - mPaddingBottom - mPaddingTop); + child.getHeight() - (getHeight() - mPaddingBottom - mPaddingTop)); } return scrollRange; } |