diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-06-28 13:52:48 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2012-06-28 19:12:37 +0900 |
| commit | ed83d4b14366b9799bf94c3f3486dc14ebd15d0f (patch) | |
| tree | 3ebccacd89d2fb216c28a3a62f143a0027028738 /java/src | |
| parent | 251bb70f087c396afc504a8d0f0221c890e88571 (diff) | |
| download | latinime-ed83d4b14366b9799bf94c3f3486dc14ebd15d0f.tar.gz latinime-ed83d4b14366b9799bf94c3f3486dc14ebd15d0f.tar.xz latinime-ed83d4b14366b9799bf94c3f3486dc14ebd15d0f.zip | |
Stop special-casing a single suggestion (A6)
Treat it like the others
Change-Id: Ic24e40ada0e75773c3ece9470ab61c350697be5d
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Suggest.java | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java index ac73bd76d..d12d81a28 100644 --- a/java/src/com/android/inputmethod/latin/Suggest.java +++ b/java/src/com/android/inputmethod/latin/Suggest.java @@ -221,17 +221,6 @@ public class Suggest { } } - final ArrayList<SuggestedWordInfo> suggestionsContainer = - new ArrayList<SuggestedWordInfo>(suggestionsSet); - for (int i = 0; i < suggestionsContainer.size(); ++i) { - final SuggestedWordInfo wordInfo = suggestionsContainer.get(i); - final SuggestedWordInfo transformedWordInfo = getTransformedSuggestedWordInfo(wordInfo, - mLocale, isAllUpperCase, isFirstCharCapitalized, trailingSingleQuotesCount); - suggestionsContainer.set(i, transformedWordInfo); - LatinImeLogger.onAddSuggestedWord(transformedWordInfo.mWord.toString(), - transformedWordInfo.mSourceDict); - } - final CharSequence whitelistedWord = mWhiteListDictionary.getWhitelistedWord(consideredWord); @@ -253,8 +242,18 @@ public class Suggest { whitelistSuggestion = new SuggestedWordInfo(whitelistedWord, SuggestedWordInfo.MAX_SCORE, SuggestedWordInfo.KIND_WHITELIST, Dictionary.TYPE_WHITELIST); - suggestionsContainer.add(0, getTransformedSuggestedWordInfo(whitelistSuggestion, - mLocale, isAllUpperCase, isFirstCharCapitalized, trailingSingleQuotesCount)); + suggestionsSet.add(whitelistSuggestion); + } + + final ArrayList<SuggestedWordInfo> suggestionsContainer = + new ArrayList<SuggestedWordInfo>(suggestionsSet); + for (int i = 0; i < suggestionsContainer.size(); ++i) { + final SuggestedWordInfo wordInfo = suggestionsContainer.get(i); + final SuggestedWordInfo transformedWordInfo = getTransformedSuggestedWordInfo(wordInfo, + mLocale, isAllUpperCase, isFirstCharCapitalized, trailingSingleQuotesCount); + suggestionsContainer.set(i, transformedWordInfo); + LatinImeLogger.onAddSuggestedWord(transformedWordInfo.mWord.toString(), + transformedWordInfo.mSourceDict); } if (!isPrediction) { |