summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/WebViewClassic.java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-05-23 15:00:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-23 15:00:47 -0700
commitcf73e52825f39d25737684825e6929616eb70b3c (patch)
tree5196590490052c00939a6e1ace2c91630df5828c /core/java/android/webkit/WebViewClassic.java
parent8c5f7616be05f0e6c199593f943fa776291fbf06 (diff)
parent5354a3277736b57daa0003409ce37c5b5f3b2236 (diff)
am 5354a327: am 8871403a: Merge "Show caret handle when clicking in the middle of text." into jb-dev
* commit '5354a3277736b57daa0003409ce37c5b5f3b2236': Show caret handle when clicking in the middle of text.
Diffstat (limited to 'core/java/android/webkit/WebViewClassic.java')
-rw-r--r--core/java/android/webkit/WebViewClassic.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 003263cf20ad..c3b420e49e93 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -7909,7 +7909,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
nativeSetTextSelection(mNativeClass, data.mSelectTextPtr);
if ((data.mSelectionReason == TextSelectionData.REASON_ACCESSIBILITY_INJECTOR)
- || (!mSelectingText
+ || (!mSelectingText && data.mStart != data.mEnd
&& data.mSelectionReason != TextSelectionData.REASON_SELECT_WORD)) {
selectionDone();
mShowTextSelectionExtra = true;