Accept whitelisted entries from any source.
...not only the WhitelistDictionary. Bug: 6906525 Change-Id: I7f181eb6936ec17bbccdc4e736fd09292af24e9cmain
parent
caed149b67
commit
7b258e512d
|
@ -208,15 +208,24 @@ public class Suggest {
|
|||
wordComposerForLookup, prevWordForBigram, proximityInfo));
|
||||
}
|
||||
|
||||
final CharSequence whitelistedWord =
|
||||
final CharSequence whitelistedWordFromWhitelistDictionary =
|
||||
mWhiteListDictionary.getWhitelistedWord(consideredWord);
|
||||
if (whitelistedWord != null) {
|
||||
if (whitelistedWordFromWhitelistDictionary != null) {
|
||||
// MAX_SCORE ensures this will be considered strong enough to be auto-corrected
|
||||
suggestionsSet.add(new SuggestedWordInfo(whitelistedWord,
|
||||
suggestionsSet.add(new SuggestedWordInfo(whitelistedWordFromWhitelistDictionary,
|
||||
SuggestedWordInfo.MAX_SCORE, SuggestedWordInfo.KIND_WHITELIST,
|
||||
Dictionary.TYPE_WHITELIST));
|
||||
}
|
||||
|
||||
final CharSequence whitelistedWord;
|
||||
if (suggestionsSet.isEmpty()) {
|
||||
whitelistedWord = null;
|
||||
} else if (SuggestedWordInfo.KIND_WHITELIST != suggestionsSet.first().mKind) {
|
||||
whitelistedWord = null;
|
||||
} else {
|
||||
whitelistedWord = suggestionsSet.first().mWord;
|
||||
}
|
||||
|
||||
// TODO: Change this scheme - a boolean is not enough. A whitelisted word may be "valid"
|
||||
// but still autocorrected from - in the case the whitelist only capitalizes the word.
|
||||
// The whitelist should be case-insensitive, so it's not possible to be consistent with
|
||||
|
|
Loading…
Reference in New Issue