diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-01-07 23:57:06 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-01-07 23:57:07 +0000 |
| commit | 8bd658555d739ad0cb30a0805f2ec087a8a6930e (patch) | |
| tree | 5b25557f23691339be665bbab753ca1e6bb30f4e /java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | |
| parent | 917bd259250cb4ba7e2f827e72a6c26baf20f3c8 (diff) | |
| parent | 38401272446dbaec785e656b921cfbd31162ba09 (diff) | |
| download | latinime-8bd658555d739ad0cb30a0805f2ec087a8a6930e.tar.gz latinime-8bd658555d739ad0cb30a0805f2ec087a8a6930e.tar.xz latinime-8bd658555d739ad0cb30a0805f2ec087a8a6930e.zip | |
Merge "Revert "Fix a race condition.""
Diffstat (limited to 'java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java')
| -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. |