nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 740d8290: Merge "Use localized toLowerString in AutoCorrection.isValidWord" 

* commit '740d829092c1900e713293e805ae333e29cb2dd0':
  Use localized toLowerString in AutoCorrection.isValidWord
main
Tadashi G. Takaoka 2013-05-24 13:01:35 -07:00 committed by Android Git Automerger
parent 5b41f31183 740d829092
commit 24b36ef7a5
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/src/com/android/inputmethod/latin/AutoCorrection.java
View File

@ -32,12 +32,13 @@ public final class AutoCorrection {
// Purely static class: can't instantiate. // Purely static class: can't instantiate.
} }
public static boolean isValidWord(final ConcurrentHashMap<String, Dictionary> dictionaries, public static boolean isValidWord(final Suggest suggest, final String word,
final String word, final boolean ignoreCase) { final boolean ignoreCase) {
if (TextUtils.isEmpty(word)) { if (TextUtils.isEmpty(word)) {
return false; return false;
} }
final String lowerCasedWord = word.toLowerCase(); final ConcurrentHashMap<String, Dictionary> dictionaries = suggest.getUnigramDictionaries();
final String lowerCasedWord = word.toLowerCase(suggest.mLocale);
for (final String key : dictionaries.keySet()) { for (final String key : dictionaries.keySet()) {
final Dictionary dictionary = dictionaries.get(key); final Dictionary dictionary = dictionaries.get(key);
// It's unclear how realistically 'dictionary' can be null, but the monkey is somehow // It's unclear how realistically 'dictionary' can be null, but the monkey is somehow

2
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -2371,7 +2371,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
final boolean showingAddToDictionaryHint = final boolean showingAddToDictionaryHint =
SuggestedWordInfo.KIND_TYPED == suggestionInfo.mKind && mSuggest != null SuggestedWordInfo.KIND_TYPED == suggestionInfo.mKind && mSuggest != null
// If the suggestion is not in the dictionary, the hint should be shown. // If the suggestion is not in the dictionary, the hint should be shown.
&& !AutoCorrection.isValidWord(mSuggest.getUnigramDictionaries(), suggestion, true); && !AutoCorrection.isValidWord(mSuggest, suggestion, true);
if (mSettings.isInternal()) { if (mSettings.isInternal()) {
Stats.onSeparator((char)Constants.CODE_SPACE, Stats.onSeparator((char)Constants.CODE_SPACE,

2
java/src/com/android/inputmethod/latin/Suggest.java
View File

@ -229,7 +229,7 @@ public final class Suggest {
// or if it's a 2+ characters non-word (i.e. it's not in the dictionary). // or if it's a 2+ characters non-word (i.e. it's not in the dictionary).
final boolean allowsToBeAutoCorrected = (null != whitelistedWord final boolean allowsToBeAutoCorrected = (null != whitelistedWord
&& !whitelistedWord.equals(consideredWord)) && !whitelistedWord.equals(consideredWord))
|| (consideredWord.length() > 1 && !AutoCorrection.isValidWord(mDictionaries, || (consideredWord.length() > 1 && !AutoCorrection.isValidWord(this,
consideredWord, wordComposer.isFirstCharCapitalized())); consideredWord, wordComposer.isFirstCharCapitalized()));
final boolean hasAutoCorrection; final boolean hasAutoCorrection;