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

Reduction, step 4

Browse source 
Change-Id: Ib27dc6e9486c3f0f2ec1e94a88a52d12c1af2d38
This commit is contained in:
Jean Chalard 2012-03-09 18:15:45 +09:00
parent 5a61d03f31
commit 0b96bc4b2b
1 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -277,15 +277,9 @@ public class Suggest implements Dictionary.WordCallback {
// Treating USER_TYPED as UNIGRAM suggestion for logging now. // Treating USER_TYPED as UNIGRAM suggestion for logging now.
LatinImeLogger.onAddSuggestedWord(typedWord, Suggest.DIC_USER_TYPED, LatinImeLogger.onAddSuggestedWord(typedWord, Suggest.DIC_USER_TYPED,
Dictionary.UNIGRAM); Dictionary.UNIGRAM);
mConsideredWord = consideredWord; mConsideredWord = "";
// TODO: Change this scheme - a boolean is not enough. A whitelisted word may be "valid" final boolean allowsToBeAutoCorrected = false;
// 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
// a boolean flag. Right now this is handled with a slight hack in
// WhitelistDictionary#shouldForciblyAutoCorrectFrom.
final boolean allowsToBeAutoCorrected = AutoCorrection.allowsToBeAutoCorrected(
getUnigramDictionaries(), consideredWord, false);
if (correctionMode == CORRECTION_FULL_BIGRAM) { if (correctionMode == CORRECTION_FULL_BIGRAM) {
// At first character typed, search only the bigrams // At first character typed, search only the bigrams
@ -309,23 +303,11 @@ public class Suggest implements Dictionary.WordCallback {
} }
CharSequence whitelistedWord = null; CharSequence whitelistedWord = null;
final boolean hasAutoCorrection;
if (CORRECTION_FULL == correctionMode
|| CORRECTION_FULL_BIGRAM == correctionMode) {
final CharSequence autoCorrection = null;
hasAutoCorrection = (null != autoCorrection);
} else {
hasAutoCorrection = false;
}
// TODO: SuggestedWords.Builder#addWord will not insert any isEmpty() word, so the
// following is useless
mSuggestions.add(0, typedWord);
StringUtils.removeDupes(mSuggestions); StringUtils.removeDupes(mSuggestions);
return new SuggestedWords.Builder().addWords(mSuggestions, null) return new SuggestedWords.Builder().addWords(mSuggestions, null)
.setAllowsToBeAutoCorrected(allowsToBeAutoCorrected) .setAllowsToBeAutoCorrected(allowsToBeAutoCorrected)
.setHasAutoCorrection(hasAutoCorrection); .setHasAutoCorrection(false);
} }
// TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder // TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder