diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-01-23 02:09:31 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-01-23 02:09:31 -0800 |
| commit | b8c71e2fa3537de1ccebe77ec458e7d840ed1586 (patch) | |
| tree | d7029f716eed3559169b3a2a4ea9deb924a5d116 /java/src/com/android/inputmethod/latin/inputlogic | |
| parent | 647466f729c2f8d9cdffb8d6c198b32207f961d3 (diff) | |
| parent | 3aa2043a66f7fcb5eaba3adae16abf5aa862d652 (diff) | |
| download | latinime-b8c71e2fa3537de1ccebe77ec458e7d840ed1586.tar.gz latinime-b8c71e2fa3537de1ccebe77ec458e7d840ed1586.tar.xz latinime-b8c71e2fa3537de1ccebe77ec458e7d840ed1586.zip | |
am 3aa2043a: Merge "[IL76] Remove a SuggestionStripView dependency"
* commit '3aa2043a66f7fcb5eaba3adae16abf5aa862d652':
[IL76] Remove a SuggestionStripView dependency
Diffstat (limited to 'java/src/com/android/inputmethod/latin/inputlogic')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java index f2687e58e..6e9bdc34a 100644 --- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java +++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java @@ -46,7 +46,6 @@ import com.android.inputmethod.latin.define.ProductionFlag; import com.android.inputmethod.latin.settings.Settings; import com.android.inputmethod.latin.settings.SettingsValues; import com.android.inputmethod.latin.settings.SpacingAndPunctuations; -import com.android.inputmethod.latin.suggestions.SuggestionStripView; import com.android.inputmethod.latin.utils.AsyncResultHolder; import com.android.inputmethod.latin.utils.CollectionUtils; import com.android.inputmethod.latin.utils.InputTypeUtils; @@ -1064,7 +1063,7 @@ public final class InputLogic { final String typedWord = range.mWord.toString(); if (includeResumedWordInSuggestions) { suggestions.add(new SuggestedWordInfo(typedWord, - SuggestionStripView.MAX_SUGGESTIONS + 1, + SuggestedWords.MAX_SUGGESTIONS + 1, SuggestedWordInfo.KIND_TYPED, Dictionary.DICTIONARY_USER_TYPED, SuggestedWordInfo.NOT_AN_INDEX /* indexOfTouchPointOfSecondWord */, SuggestedWordInfo.NOT_A_CONFIDENCE /* autoCommitFirstWordConfidence */)); @@ -1076,7 +1075,7 @@ public final class InputLogic { ++i; if (!TextUtils.equals(s, typedWord)) { suggestions.add(new SuggestedWordInfo(s, - SuggestionStripView.MAX_SUGGESTIONS - i, + SuggestedWords.MAX_SUGGESTIONS - i, SuggestedWordInfo.KIND_RESUMED, Dictionary.DICTIONARY_RESUMED, SuggestedWordInfo.NOT_AN_INDEX /* indexOfTouchPointOfSecondWord */, SuggestedWordInfo.NOT_A_CONFIDENCE |