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

Commit 598b6fe8 authored by Huahui Wu's avatar Huahui Wu Committed by Android (Google) Code Review
Browse files

Merge "b/4070489 Jumpy motion when switching fingers during zoom gesture."

parents 040c2f91 5f4835af

core/java/android/webkit/WebView.java

+2 −2
Original line number Diff line number Diff line
@@ -6330,8 +6330,8 @@ public class WebView extends AbsoluteLayout 
        if (action == MotionEvent.ACTION_POINTER_DOWN) {

            cancelTouch();

            action = MotionEvent.ACTION_DOWN;

        } else if (action == MotionEvent.ACTION_POINTER_UP && ev.getPointerCount() == 2) {

            // set mLastTouchX/Y to the remaining point

        } else if (action == MotionEvent.ACTION_POINTER_UP && ev.getPointerCount() >= 2) {

            // set mLastTouchX/Y to the remaining points for multi-touch.

            mLastTouchX = Math.round(x);

            mLastTouchY = Math.round(y);

        } else if (action == MotionEvent.ACTION_MOVE) {

core/java/android/webkit/ZoomManager.java

+2 −0
Original line number Diff line number Diff line
@@ -794,6 +794,8 @@ class ZoomManager { 
            mInitialZoomOverview = false;

            dismissZoomPicker();

            mFocusMovementQueue.clear();

            mFocusX = detector.getFocusX();

            mFocusY = detector.getFocusY();

            mWebView.mViewManager.startZoom();

            mWebView.onPinchToZoomAnimationStart();

            mAccumulatedSpan = 0;