Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread

Browse Source
This commit is contained in:
Adam Powell
2010-10-04 15:24:29 -07:00
committed by Android (Google) Code Review
parent 458fc5f52e 62a744e17d
commit 103f59baa7
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/widget/HorizontalScrollView.java
View File

@@ -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;
}

6
core/java/android/widget/ScrollView.java
View File

@@ -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;
}