diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-01-26 02:17:33 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-01-26 02:17:33 -0800 |
| commit | 7498ef4d0e3794e2967f4c3989e48dc800406d60 (patch) | |
| tree | f3eddf70b9659c4a2aca9a1a10c5e74562c96491 /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | 6f53d79379fd543cc64d50109ed775f975060854 (diff) | |
| parent | dd5e1d157b6bd8d7642dfd1dd855c97adc9f4b67 (diff) | |
| download | latinime-7498ef4d0e3794e2967f4c3989e48dc800406d60.tar.gz latinime-7498ef4d0e3794e2967f4c3989e48dc800406d60.tar.xz latinime-7498ef4d0e3794e2967f4c3989e48dc800406d60.zip | |
am dd5e1d15: Merge "Remove mCommittedWordSavedForSuggestionResuming (A4)"
* commit 'dd5e1d157b6bd8d7642dfd1dd855c97adc9f4b67':
Remove mCommittedWordSavedForSuggestionResuming (A4)
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 5ef35dab5..62b287e3c 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -2165,7 +2165,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar // "ic" must not be null private void cancelAutoCorrect(final InputConnection ic) { - mWordComposer.resumeSuggestionOnKeptWord(); + mWordComposer.resumeSuggestionOnLastComposedWord(mLastComposedWord); final String originallyTypedWord = mWordComposer.getTypedWord(); final CharSequence autoCorrectedTo = mWordComposer.getAutoCorrectionOrNull(); final int cancelLength = autoCorrectedTo.length(); @@ -2205,7 +2205,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar // Note: in the interest of code simplicity, we may want to just call // restartSuggestionsOnWordBeforeCursorIfAtEndOfWord instead, but retrieving // the old WordComposer allows to reuse the actual typed coordinates. - mWordComposer.resumeSuggestionOnKeptWord(); + mWordComposer.resumeSuggestionOnLastComposedWord(mLastComposedWord); // We resume suggestion, and then we want to set the composing text to the content // of the word composer again. But since we just manually picked a word, there is // no composing text at the moment, so we have to delete the word before we set a |