diff options
| author | Cary Clark <cary@android.com> | 2010-11-17 13:49:25 -0500 |
|---|---|---|
| committer | Cary Clark <cary@android.com> | 2010-11-17 13:49:25 -0500 |
| commit | 1e8e10db3f17558b23f5cbef986f3289cc917bc6 (patch) | |
| tree | 4cd99361819f4490ec8f13cc6d378afd1e6d8b9f /core | |
| parent | 05b07fd204cc9cc340dc579db17008bf9e8161fd (diff) | |
| download | frameworks_base-1e8e10db3f17558b23f5cbef986f3289cc917bc6.zip frameworks_base-1e8e10db3f17558b23f5cbef986f3289cc917bc6.tar.gz frameworks_base-1e8e10db3f17558b23f5cbef986f3289cc917bc6.tar.bz2 | |
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
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 092934b..f2988bc 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -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(); |