diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-01-15 11:23:51 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-01-15 11:23:51 -0800 |
| commit | 4de33765cb54f91b168e32794421c0ba13e62fc8 (patch) | |
| tree | 5070d6c205633f7d5be413981510c8739fce428a /java/src/com/android/inputmethod/latin/LastComposedWord.java | |
| parent | bafcf362b073354ad6b5a74d21e1b85ceb58a3e6 (diff) | |
| parent | 118a4fc2b7fc4f0ba1de78eb0ef72b473a6ecfd5 (diff) | |
| download | latinime-4de33765cb54f91b168e32794421c0ba13e62fc8.tar.gz latinime-4de33765cb54f91b168e32794421c0ba13e62fc8.tar.xz latinime-4de33765cb54f91b168e32794421c0ba13e62fc8.zip | |
am 118a4fc2: Merge "[IL56] Don\'t erase suggestions when reverting a commit."
* commit '118a4fc2b7fc4f0ba1de78eb0ef72b473a6ecfd5':
[IL56] Don't erase suggestions when reverting a commit.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LastComposedWord.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LastComposedWord.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LastComposedWord.java b/java/src/com/android/inputmethod/latin/LastComposedWord.java index 2e9280c77..8546cebd5 100644 --- a/java/src/com/android/inputmethod/latin/LastComposedWord.java +++ b/java/src/com/android/inputmethod/latin/LastComposedWord.java @@ -42,7 +42,7 @@ public final class LastComposedWord { public final int[] mPrimaryKeyCodes; public final String mTypedWord; - public final String mCommittedWord; + public final CharSequence mCommittedWord; public final String mSeparatorString; public final String mPrevWord; public final int mCapitalizedMode; @@ -58,7 +58,7 @@ public final class LastComposedWord { // Warning: this is using the passed objects as is and fully expects them to be // immutable. Do not fiddle with their contents after you passed them to this constructor. public LastComposedWord(final int[] primaryKeyCodes, final InputPointers inputPointers, - final String typedWord, final String committedWord, final String separatorString, + final String typedWord, final CharSequence committedWord, final String separatorString, final String prevWord, final int capitalizedMode) { mPrimaryKeyCodes = primaryKeyCodes; if (inputPointers != null) { |