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

Never drag scroll views with no children.

Browse Source 
Fixes a regression from Froyo.  Previously, when a scroll view
had no children, its onTouchEvent would return because the scroll
view would only start dragging if the user touched one of its children.
In Gingerbread, the user can drag from anywhere within the scroll
view, not just by touching a child.  However, it makes no sense
to drag a scroll view that has no children so an empty scroll view
should just ignore touches like any other empty view group would.

This change fixes applications that for some reason or other happen
to have empty scroll views in strange places.

Bug: 3246230
Change-Id: Iada6e886e8363e6778f42fc4861de228512d8bed
This commit is contained in:
Jeff Brown
2011-01-18 18:42:33 -08:00
parent 36c84403ec
commit fb75738ee2
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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