summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHui Shu <hush@google.com>2014-11-25 19:16:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-25 19:16:25 +0000
commit878de556fd9069b73122eb5d6155afc6b89112ce (patch)
tree2ac601178e048352518bfc9cbabe22766b652a62
parent239f71cccdd3c5b2f3c4304631d39b6111a2cb26 (diff)
parenta62aef3d7fa98aafb37014ac82b34260f3f91d9b (diff)
downloadchromium_org-878de556fd9069b73122eb5d6155afc6b89112ce.tar.gz
Merge "Cherry pick: Preserve IME state when clearing the selection" into m39
-rw-r--r--content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 196f83d9de..3140e22e87 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -1301,7 +1301,7 @@ public class ContentViewCore
}
private void clearUserSelection() {
- if (isSelectionEditable()) {
+ if (mFocusedNodeEditable) {
if (mInputConnection != null) {
int selectionEnd = Selection.getSelectionEnd(mEditable);
mInputConnection.setSelection(selectionEnd, selectionEnd);