aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2014-01-07 23:26:54 +0000
committerThe Android Automerger <android-build@android.com>2014-01-07 16:23:29 -0800
commitfaa4c7b6413b45a974022970b17eddf42b1c65ba (patch)
tree8e4b4daef265bb8255c26f3b42fa1a82756e36d0 /java/src
parent8a2537e0ae324466c201573845b681bbab2e625e (diff)
downloadlatinime-faa4c7b6413b45a974022970b17eddf42b1c65ba.tar.gz
latinime-faa4c7b6413b45a974022970b17eddf42b1c65ba.tar.xz
latinime-faa4c7b6413b45a974022970b17eddf42b1c65ba.zip
Revert "Fix a race condition."
This reverts commit 42e83c7f06a1683b27a11564aeb9f3999b10382f. Bug: 12434783 Change-Id: Id01b6d14906430b13e64f5fc4d7fb01572d0a960
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java7
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.