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

Commit 461cef5d authored by Grace Kloba's avatar Grace Kloba Committed by Android (Google) Code Review
Browse files

Merge "As we don't support over scroll any more, we need to pin the (x,y) if... 

Merge "As we don't support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo
parents 3fe1708d ad7a1d79

core/java/android/webkit/WebView.java

+9 −4
Original line number Diff line number Diff line
@@ -6413,10 +6413,15 @@ public class WebView extends AbsoluteLayout 
                                    mLastDeferTouchY = y;

                                    startDrag();

                                }

                                doDrag((int) (mLastDeferTouchX - x),

                                        (int) (mLastDeferTouchY - y));

                                mLastDeferTouchX = x;

                                mLastDeferTouchY = y;

                                int deltaX = pinLocX((int) (mScrollX

                                        + mLastDeferTouchX - x))

                                        - mScrollX;

                                int deltaY = pinLocY((int) (mScrollY

                                        + mLastDeferTouchY - y))

                                        - mScrollY;

                                doDrag(deltaX, deltaY);

                                if (deltaX != 0) mLastDeferTouchX = x;

                                if (deltaY != 0) mLastDeferTouchY = y;

                                break;

                            }

                            case MotionEvent.ACTION_UP: