aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-01-08 07:44:08 +0000
committerJean Chalard <jchalard@google.com>2014-01-08 16:44:43 +0900
commitf628629f69228a4898f60334e89213cd20fdac52 (patch)
treeafab549dfce2ea835fdabd534a6a663e788ed55c /java/src
parentb3c51630a6b8dc09c161c7720db7bae21b0cf27e (diff)
downloadlatinime-f628629f69228a4898f60334e89213cd20fdac52.tar.gz
latinime-f628629f69228a4898f60334e89213cd20fdac52.tar.xz
latinime-f628629f69228a4898f60334e89213cd20fdac52.zip
Revert "Revert "Fix a race condition.""
This reverts commit 38401272446dbaec785e656b921cfbd31162ba09. Change-Id: I7f0d975ec9e18d94fe3505250360c2b79ccbe96d
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index cc42d8785..e0adacd0c 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -1114,8 +1114,11 @@ public final class InputLogic {
keyboardSwitcher.getKeyboard());
mWordComposer.setCursorPositionWithinWord(
typedWord.codePointCount(0, numberOfCharsInWordBeforeCursor));
- mConnection.setComposingRegion(expectedCursorPosition - numberOfCharsInWordBeforeCursor,
- expectedCursorPosition + range.getNumberOfCharsInWordAfterCursor());
+ // TODO: Change these two lines to setComposingRegion(cursorPosition,
+ // cursorPosition + range.getNumberOfCharsInWordAfterCursor());
+ mConnection.deleteSurroundingText(numberOfCharsInWordBeforeCursor,
+ typedWord.length() - numberOfCharsInWordBeforeCursor);
+ mConnection.setComposingText(typedWord, 1);
if (suggestions.isEmpty()) {
// We come here if there weren't any suggestion spans on this word. We will try to
// compute suggestions for it instead.