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

Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair

Browse Source
This commit is contained in:
Grace Kloba
2010-01-18 15:21:38 -08:00
committed by Android (Google) Code Review
parent f080a5adf6 d4d1d6eca0
commit d79d1c7299
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/widget/ZoomButtonsController.java
View File

@@ -546,6 +546,11 @@ public class ZoomButtonsController implements View.OnTouchListener {
public boolean onTouch(View v, MotionEvent event) { public boolean onTouch(View v, MotionEvent event) {
int action = event.getAction(); int action = event.getAction();
if (event.getPointerCount() > 1) {
// ZoomButtonsController doesn't handle mutitouch. Give up control.
return false;
}
if (mReleaseTouchListenerOnUp) { if (mReleaseTouchListenerOnUp) {
// The controls were dismissed but we need to throw away all events until the up // The controls were dismissed but we need to throw away all events until the up
if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {