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

Commit 2b87dbc3 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am c417612a: Merge "Fix bug 3083631 - Links no longer get tapped during scale... 

am c417612a: Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread

Merge commit 'c417612a' into gingerbread-plus-aosp

* commit 'c417612a':
  Fix bug 3083631 - Links no longer get tapped during scale gestures
parents 79a5307a c417612a

core/java/android/webkit/WebView.java

+2 −0
Original line number Diff line number Diff line
@@ -5057,6 +5057,8 @@ public class WebView extends AbsoluteLayout 
                    if (!mAllowPanAndScale) {

                        return true;

                    }

                    mPrivateHandler.removeMessages(SWITCH_TO_SHORTPRESS);

                    mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS);

                }

                x = mScaleDetector.getFocusX();

                y = mScaleDetector.getFocusY();