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

Merge "Refactoring for whitelist (A83)"

Browse source
This commit is contained in:
Jean Chalard 2012-07-10 02:24:58 -07:00 committed by Android (Google) Code Review
commit 184c552917
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
java/src/com/android/inputmethod/latin/Suggest.java
View file

@ -194,9 +194,6 @@ public class Suggest {
} }
// At second character typed, search the unigrams (scores being affected by bigrams) // At second character typed, search the unigrams (scores being affected by bigrams)
for (final String key : mDictionaries.keySet()) { for (final String key : mDictionaries.keySet()) {
// Skip WhitelistDictionary to lookup
if (key.equals(Dictionary.TYPE_WHITELIST))
continue;
final Dictionary dictionary = mDictionaries.get(key); final Dictionary dictionary = mDictionaries.get(key);
suggestionsSet.addAll(dictionary.getWords( suggestionsSet.addAll(dictionary.getWords(
wordComposerForLookup, prevWordForBigram, proximityInfo)); wordComposerForLookup, prevWordForBigram, proximityInfo));

11
java/src/com/android/inputmethod/latin/WhitelistDictionary.java
View file

@ -22,8 +22,11 @@ import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
import com.android.inputmethod.keyboard.ProximityInfo;
import com.android.inputmethod.latin.LocaleUtils.RunInLocale; import com.android.inputmethod.latin.LocaleUtils.RunInLocale;
import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
@ -88,6 +91,14 @@ public class WhitelistDictionary extends ExpandableDictionary {
return null; return null;
} }
@Override
public ArrayList<SuggestedWordInfo> getWords(final WordComposer composer,
final CharSequence prevWord, final ProximityInfo proximityInfo) {
// Whitelist does not supply suggestions (actually it should not even implement the
// Dictionary interface, as it responds to none of it, but it does for legacy reasons)
return null;
}
// See LatinIME#updateSuggestions. This breaks in the (queer) case that the whitelist // See LatinIME#updateSuggestions. This breaks in the (queer) case that the whitelist
// lists that word a should autocorrect to word b, and word c would autocorrect to // lists that word a should autocorrect to word b, and word c would autocorrect to
// an upper-cased version of a. In this case, the way this return value is used would // an upper-cased version of a. In this case, the way this return value is used would