diff options
| author | 2012-02-23 15:23:35 -0800 | |
|---|---|---|
| committer | 2012-02-23 15:23:35 -0800 | |
| commit | 9a6077e22eeb0364b6b66d92f594f30cfdf5448c (patch) | |
| tree | 23f19b1bc7212aa44ba4ba5eec7845d2d572440c | |
| parent | a4b8a2e4d1284a95f3d77a407784621cb73cfb1e (diff) | |
Disable selection when nothing selected.
Bug 6059606
Change-Id: I2c9acaa601e38a2cd0eec516709aa63f31ce0e29
| -rw-r--r-- | core/java/android/webkit/WebView.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 5601dca8cbe4..9e44f2f46eaf 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -9492,10 +9492,11 @@ public class WebView extends AbsoluteLayout } } nativeSetTextSelection(mNativeClass, data.mSelectTextPtr); - if (data.mSelectTextPtr != 0) { - mIsCaretSelection = (mFieldPointer == nodePointer) - && (mFieldPointer != 0) - && (data.mStart == data.mEnd); + + if (data.mSelectTextPtr != 0 && + (data.mStart != data.mEnd || + (mFieldPointer == nodePointer && mFieldPointer != 0))) { + mIsCaretSelection = (data.mStart == data.mEnd); if (!mSelectingText) { setupWebkitSelect(); } else if (!mSelectionStarted) { |