Transform the whitelist suggestion like the others (A4)

...instead of having a different code path

Change-Id: Icd177e2151e45d25300000d4b63d4fba1f52b6a8
This commit is contained in:
Jean Chalard 2012-06-28 13:21:09 +09:00
parent 33b3805e79
commit 4c4e3a0949

View file

@ -249,8 +249,8 @@ public class Suggest {
transformedWordInfo.mSourceDict); transformedWordInfo.mSourceDict);
} }
final CharSequence whitelistedWord = capitalizeWord(isAllUpperCase, final CharSequence whitelistedWord =
isFirstCharCapitalized, mWhiteListDictionary.getWhitelistedWord(consideredWord)); mWhiteListDictionary.getWhitelistedWord(consideredWord);
final boolean hasAutoCorrection; final boolean hasAutoCorrection;
if (isCorrectionEnabled) { if (isCorrectionEnabled) {
@ -267,20 +267,11 @@ public class Suggest {
if (whitelistedWord != null) { if (whitelistedWord != null) {
final SuggestedWordInfo whitelistSuggestion; final SuggestedWordInfo whitelistSuggestion;
if (trailingSingleQuotesCount > 0) {
final StringBuilder sb = new StringBuilder(whitelistedWord);
for (int i = trailingSingleQuotesCount - 1; i >= 0; --i) {
sb.appendCodePoint(Keyboard.CODE_SINGLE_QUOTE);
}
whitelistSuggestion = new SuggestedWordInfo(sb.toString(),
SuggestedWordInfo.MAX_SCORE, SuggestedWordInfo.KIND_WHITELIST,
Dictionary.TYPE_WHITELIST);
} else {
whitelistSuggestion = new SuggestedWordInfo(whitelistedWord, whitelistSuggestion = new SuggestedWordInfo(whitelistedWord,
SuggestedWordInfo.MAX_SCORE, SuggestedWordInfo.KIND_WHITELIST, SuggestedWordInfo.MAX_SCORE, SuggestedWordInfo.KIND_WHITELIST,
Dictionary.TYPE_WHITELIST); Dictionary.TYPE_WHITELIST);
} suggestionsContainer.add(0, getTransformedSuggestedWordInfo(whitelistSuggestion,
suggestionsContainer.add(0, whitelistSuggestion); mLocale, isAllUpperCase, isFirstCharCapitalized, trailingSingleQuotesCount));
} }
if (!isPrediction) { if (!isPrediction) {