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

Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread

Browse Source
This commit is contained in:
Jeff Brown
2011-01-19 17:03:03 -08:00
committed by Android (Google) Code Review
parent a0bafb4713 39bc6197ba
commit d0725eef67
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -502,8 +502,10 @@ public class HorizontalScrollView extends FrameLayout {
switch (action & MotionEvent.ACTION_MASK) { switch (action & MotionEvent.ACTION_MASK) {
case MotionEvent.ACTION_DOWN: { case MotionEvent.ACTION_DOWN: {
final float x = ev.getX(); mIsBeingDragged = getChildCount() != 0;
mIsBeingDragged = true; if (!mIsBeingDragged) {
return false;
}
/* /*
* If being flinged and user touches, stop the fling. isFinished * 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 // Remember where the motion event started
mLastMotionX = x; mLastMotionX = ev.getX();
mActivePointerId = ev.getPointerId(0); mActivePointerId = ev.getPointerId(0);
break; break;
} }

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

@@ -497,9 +497,11 @@ public class ScrollView extends FrameLayout {
switch (action & MotionEvent.ACTION_MASK) { switch (action & MotionEvent.ACTION_MASK) {
case MotionEvent.ACTION_DOWN: { case MotionEvent.ACTION_DOWN: {
final float y = ev.getY(); mIsBeingDragged = getChildCount() != 0;
mIsBeingDragged = true; if (!mIsBeingDragged) {
return false;
}
/* /*
* If being flinged and user touches, stop the fling. isFinished * If being flinged and user touches, stop the fling. isFinished
* will be false if being flinged. * will be false if being flinged.
@@ -509,7 +511,7 @@ public class ScrollView extends FrameLayout {
} }
// Remember where the motion event started // Remember where the motion event started
mLastMotionY = y; mLastMotionY = ev.getY();
mActivePointerId = ev.getPointerId(0); mActivePointerId = ev.getPointerId(0);
break; break;
} }