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

Merge "Fix bug 2995805 - splitMotionEvents behavior change"

Browse Source
This commit is contained in:
Adam Powell
2010-09-13 18:18:47 -07:00
committed by Android (Google) Code Review
parent 87a76578f7 167bc821dd
commit 5f12084daa
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/ViewGroup.java
View File

@@ -877,7 +877,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
mSplitMotionTargets = new SplitMotionTargets();
}
return dispatchSplitTouchEvent(ev);
}
}
final int action = ev.getAction();
final float xf = ev.getX();
@@ -1222,13 +1222,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
uniqueTargetCount--;
}
final boolean childHandled = target.dispatchTouchEvent(targetEvent);
handled |= childHandled;
if (!childHandled) {
// Child doesn't want these events anymore, but we're still dispatching
// other split events to children.
targets.removeView(target);
}
handled |= target.dispatchTouchEvent(targetEvent);
} finally {
targetEvent.recycle();
}