diff options
author | 2014-01-07 15:59:47 -0800 | |
---|---|---|
committer | 2014-01-07 15:59:47 -0800 | |
commit | 356206178af7a9936981024f69be06e85c711a81 (patch) | |
tree | 5b25557f23691339be665bbab753ca1e6bb30f4e | |
parent | 1521d87aa601ea7352a5cd3dee6423ea7879a264 (diff) | |
parent | 8bd658555d739ad0cb30a0805f2ec087a8a6930e (diff) | |
download | latinime-356206178af7a9936981024f69be06e85c711a81.tar.gz latinime-356206178af7a9936981024f69be06e85c711a81.tar.xz latinime-356206178af7a9936981024f69be06e85c711a81.zip |
am 8bd65855: Merge "Revert "Fix a race condition.""
* commit '8bd658555d739ad0cb30a0805f2ec087a8a6930e':
Revert "Fix a race condition."
-rw-r--r-- | java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java index c867ab3d3..b365003a5 100644 --- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java +++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java @@ -1113,11 +1113,8 @@ public final class InputLogic { keyboardSwitcher.getKeyboard()); mWordComposer.setCursorPositionWithinWord( typedWord.codePointCount(0, numberOfCharsInWordBeforeCursor)); - // TODO: Change these two lines to setComposingRegion(cursorPosition, - // cursorPosition + range.getNumberOfCharsInWordAfterCursor()); - mConnection.deleteSurroundingText(numberOfCharsInWordBeforeCursor, - typedWord.length() - numberOfCharsInWordBeforeCursor); - mConnection.setComposingText(typedWord, 1); + mConnection.setComposingRegion(expectedCursorPosition - numberOfCharsInWordBeforeCursor, + expectedCursorPosition + range.getNumberOfCharsInWordAfterCursor()); 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. |