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

Commit ddba200b authored by Huahui Wu's avatar Huahui Wu Committed by Android Git Automerger
Browse files

am 9691d3f3: am b71020ef: Merge "b/3392594 keep the remain touch points when... 

am 9691d3f3: am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1

* commit '9691d3f3':
  b/3392594 keep the remain touch points when one is ended.
parents 21e30abf 9691d3f3

core/java/android/webkit/WebView.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -5964,6 +5964,10 @@ public class WebView extends AbsoluteLayout 
            int y = viewToContentY((int) ev.getY(c) + mScrollY);

            int y = viewToContentY((int) ev.getY(c) + mScrollY);

            ted.mPoints[c] = new Point(x, y);

            ted.mPoints[c] = new Point(x, y);

        }

        }

        if (ted.mAction == MotionEvent.ACTION_POINTER_DOWN

            || ted.mAction == MotionEvent.ACTION_POINTER_UP) {

            ted.mActionIndex = ev.getActionIndex();

        }

        ted.mMetaState = ev.getMetaState();

        ted.mMetaState = ev.getMetaState();

        ted.mReprocess = true;

        ted.mReprocess = true;

        ted.mMotionEvent = MotionEvent.obtain(ev);

        ted.mMotionEvent = MotionEvent.obtain(ev);

core/java/android/webkit/WebViewCore.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -572,7 +572,7 @@ final class WebViewCore { 
            int framePtr, int nodePtr, int x, int y);

            int framePtr, int nodePtr, int x, int y);





    private native boolean nativeHandleTouchEvent(int action, int[] idArray,

    private native boolean nativeHandleTouchEvent(int action, int[] idArray,

            int[] xArray, int[] yArray, int count, int metaState);

            int[] xArray, int[] yArray, int count, int actionIndex, int metaState);





    private native void nativeUpdateFrameCache();

    private native void nativeUpdateFrameCache();
@@ -829,6 +829,7 @@ final class WebViewCore { 
        int mAction;

        int mAction;

        int[] mIds;  // Ids of the touch points

        int[] mIds;  // Ids of the touch points

        Point[] mPoints;

        Point[] mPoints;

        int mActionIndex;  // Associated pointer index for ACTION_POINTER_DOWN/UP

        int mMetaState;

        int mMetaState;

        boolean mReprocess;

        boolean mReprocess;

        MotionEvent mMotionEvent;

        MotionEvent mMotionEvent;
@@ -1344,7 +1345,7 @@ final class WebViewCore { 
                                        ted.mNativeLayerRect);

                                        ted.mNativeLayerRect);

                            }

                            }

                            ted.mNativeResult = nativeHandleTouchEvent(ted.mAction, ted.mIds,

                            ted.mNativeResult = nativeHandleTouchEvent(ted.mAction, ted.mIds,

                                    xArray, yArray, count, ted.mMetaState);

                                    xArray, yArray, count, ted.mActionIndex, ted.mMetaState);

                            Message.obtain(

                            Message.obtain(

                                    mWebView.mPrivateHandler,

                                    mWebView.mPrivateHandler,

                                    WebView.PREVENT_TOUCH_ID,

                                    WebView.PREVENT_TOUCH_ID,