diff options
| author | Adam Powell <adamp@google.com> | 2010-10-04 15:48:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 15:48:37 -0700 |
| commit | b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669 (patch) | |
| tree | 145f3d60a16ced956b57ecc58a0db120759a2c10 /core/java | |
| parent | 89230e3b7b9ec455373e3f60b62ff65589a9c57d (diff) | |
| parent | 103f59baa7f7d03cfe22a4b07690cc809185dfe9 (diff) | |
am 103f59ba: Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread
Merge commit '103f59baa7f7d03cfe22a4b07690cc809185dfe9' into gingerbread-plus-aosp
* commit '103f59baa7f7d03cfe22a4b07690cc809185dfe9':
Fix bug 3052686 - ScrollView padding treated incorrectly
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/HorizontalScrollView.java | 6 | ||||
| -rw-r--r-- | core/java/android/widget/ScrollView.java | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java index 0bb97dd359af..cd10a59991a4 100644 --- a/core/java/android/widget/HorizontalScrollView.java +++ b/core/java/android/widget/HorizontalScrollView.java @@ -503,9 +503,7 @@ public class HorizontalScrollView extends FrameLayout { switch (action & MotionEvent.ACTION_MASK) { case MotionEvent.ACTION_DOWN: { final float x = ev.getX(); - if (!(mIsBeingDragged = inChild((int) x, (int) ev.getY()))) { - return false; - } + mIsBeingDragged = true; /* * If being flinged and user touches, stop the fling. isFinished @@ -642,7 +640,7 @@ public class HorizontalScrollView extends FrameLayout { if (getChildCount() > 0) { View child = getChildAt(0); scrollRange = Math.max(0, - child.getWidth() - getWidth() - mPaddingLeft - mPaddingRight); + child.getWidth() - (getWidth() - mPaddingLeft - mPaddingRight)); } return scrollRange; } 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; } |