diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-08-29 01:18:14 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-08-29 01:18:15 -0700 |
| commit | 4fa01ee570cf4d4aab3a7cdca5246d8f119ac6f1 (patch) | |
| tree | 06c3ef95e8683eebbfe0c31ef953bc368e7e6923 /java/src/com/android/inputmethod/latin/WordComposer.java | |
| parent | 9879f65651a748e4c0a45715eb7d5663652f1127 (diff) | |
| parent | a05a0f20776b4c33f41f043f1bff245331937580 (diff) | |
| download | latinime-4fa01ee570cf4d4aab3a7cdca5246d8f119ac6f1.tar.gz latinime-4fa01ee570cf4d4aab3a7cdca5246d8f119ac6f1.tar.xz latinime-4fa01ee570cf4d4aab3a7cdca5246d8f119ac6f1.zip | |
Merge "Allow Latin IME to cancel smiley-auto-correct consistenly" into jb-mr1-dev
Diffstat (limited to 'java/src/com/android/inputmethod/latin/WordComposer.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/WordComposer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/WordComposer.java b/java/src/com/android/inputmethod/latin/WordComposer.java index ecec60f89..4b7adf26b 100644 --- a/java/src/com/android/inputmethod/latin/WordComposer.java +++ b/java/src/com/android/inputmethod/latin/WordComposer.java @@ -336,14 +336,14 @@ public class WordComposer { // `type' should be one of the LastComposedWord.COMMIT_TYPE_* constants above. public LastComposedWord commitWord(final int type, final String committedWord, - final int separatorCode, final CharSequence prevWord) { + final String separatorString, final CharSequence prevWord) { // Note: currently, we come here whenever we commit a word. If it's a MANUAL_PICK // or a DECIDED_WORD we may cancel the commit later; otherwise, we should deactivate // the last composed word to ensure this does not happen. final int[] primaryKeyCodes = mPrimaryKeyCodes; mPrimaryKeyCodes = new int[N]; final LastComposedWord lastComposedWord = new LastComposedWord(primaryKeyCodes, - mInputPointers, mTypedWord.toString(), committedWord, separatorCode, + mInputPointers, mTypedWord.toString(), committedWord, separatorString, prevWord); mInputPointers.reset(); if (type != LastComposedWord.COMMIT_TYPE_DECIDED_WORD |