Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01752fe4 authored by Grace Kloba's avatar Grace Kloba Committed by Android Git Automerger
Browse files

am 8d4baa78: am d79d1c72: Merge "If ZoomButttonsController detects more than... 

am 8d4baa78: am d79d1c72: 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

Merge commit '8d4baa78'

* commit '8d4baa78':
  If ZoomButttonsController detects more than one pointer,
parents 3ccf06e2 8d4baa78

core/java/android/widget/ZoomButtonsController.java

+5 −0
Original line number Diff line number Diff line
@@ -546,6 +546,11 @@ public class ZoomButtonsController implements View.OnTouchListener { 
    public boolean onTouch(View v, MotionEvent event) {

        int action = event.getAction();



        if (event.getPointerCount() > 1) {

            // ZoomButtonsController doesn't handle mutitouch. Give up control.

            return false;

        }



        if (mReleaseTouchListenerOnUp) {

            // The controls were dismissed but we need to throw away all events until the up

            if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {