aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-01-08 08:35:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-01-08 08:35:19 +0000
commit0a0a3cdad83ae0923c503c394ebdefafff2a217b (patch)
tree323d2d5e44d3c510429a8ad4d441888791d002a0 /java/src
parentad78058a93492d4f114c6a6eb56177be9231a9eb (diff)
parentf628629f69228a4898f60334e89213cd20fdac52 (diff)
downloadlatinime-0a0a3cdad83ae0923c503c394ebdefafff2a217b.tar.gz
latinime-0a0a3cdad83ae0923c503c394ebdefafff2a217b.tar.xz
latinime-0a0a3cdad83ae0923c503c394ebdefafff2a217b.zip
Merge "Revert "Revert "Fix a race condition."""
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.