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

Commit 1e8e10db authored by Cary Clark's avatar Cary Clark
Browse files

don't put up a context menu while selecting text 

Move the check for selecting text before calling
the parent, so that the context menu isn't an
available option.

bug:3205306
Change-Id: I5d2c3f6b71c74cda56153fbc773eb5be98e44be7
parent 05b07fd2

core/java/android/webkit/WebView.java

+1 −1
Original line number Diff line number Diff line
@@ -3558,6 +3558,7 @@ public class WebView extends AbsoluteLayout 
        if (inEditingMode()) {

            return mWebTextView.performLongClick();

        }

        if (mSelectingText) return false; // long click does nothing on selection

        /* if long click brings up a context menu, the super function

         * returns true and we're done. Otherwise, nothing happened when

         * the user clicked. */
@@ -3568,7 +3569,6 @@ public class WebView extends AbsoluteLayout 
         * click action, look for a word under the  click. If one is found,

         * animate the text selection into view.

         * FIXME: no animation code yet */

        if (mSelectingText) return false; // long click does nothing on selection

        int x = viewToContentX((int) mLastTouchX + mScrollX);

        int y = viewToContentY((int) mLastTouchY + mScrollY);

        setUpSelect();