Merge "Kill the last place where the Builder was being used"

main
Jean Chalard 2012-03-13 21:22:03 -07:00 committed by Android (Google) Code Review
commit 7d384c73da
2 changed files with 6 additions and 29 deletions

View File

@ -1977,23 +1977,23 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
return; return;
} }
final SuggestedWords.Builder builder; final SuggestedWords suggestedWords;
if (mCorrectionMode == Suggest.CORRECTION_FULL_BIGRAM) { if (mCorrectionMode == Suggest.CORRECTION_FULL_BIGRAM) {
final CharSequence prevWord = EditingUtils.getThisWord(getCurrentInputConnection(), final CharSequence prevWord = EditingUtils.getThisWord(getCurrentInputConnection(),
mSettingsValues.mWordSeparators); mSettingsValues.mWordSeparators);
if (!TextUtils.isEmpty(prevWord)) { if (!TextUtils.isEmpty(prevWord)) {
builder = mSuggest.getBigramPredictionWordBuilder(prevWord); suggestedWords = mSuggest.getBigramPredictionWordBuilder(prevWord).build();
} else { } else {
builder = null; suggestedWords = null;
} }
} else { } else {
builder = null; suggestedWords = null;
} }
if (null != builder && builder.size() > 0) { if (null != suggestedWords && suggestedWords.size() > 0) {
// Explicitly supply an empty typed word (the no-second-arg version of // Explicitly supply an empty typed word (the no-second-arg version of
// showSuggestions will retrieve the word near the cursor, we don't want that here) // showSuggestions will retrieve the word near the cursor, we don't want that here)
showSuggestions(builder.build(), ""); showSuggestions(suggestedWords, "");
} else { } else {
if (!isShowingPunctuationList()) setPunctuationSuggestions(); if (!isShowingPunctuationList()) setPunctuationSuggestions();
} }

View File

@ -141,29 +141,6 @@ public class SuggestedWords {
mIsPunctuationSuggestions, mShouldBlockAutoCorrectionBySafetyNet, mIsPunctuationSuggestions, mShouldBlockAutoCorrectionBySafetyNet,
mAllowsToBeAutoCorrected, mSuggestedWordInfoList); mAllowsToBeAutoCorrected, mSuggestedWordInfoList);
} }
public int size() {
return mSuggestedWordInfoList.size();
}
public CharSequence getWord(int pos) {
return mSuggestedWordInfoList.get(pos).mWord;
}
public boolean allowsToBeAutoCorrected() {
return mAllowsToBeAutoCorrected;
}
@Override
public String toString() {
// Pretty-print method to help debug
return "SuggestedWords.Builder:"
+ " mTypedWordValid=" + mTypedWordValid
+ " mHasMinimalSuggestion=" + mHasMinimalSuggestion
+ " mIsPunctuationSuggestions=" + mIsPunctuationSuggestions
+ " mShouldBlockAutoCorrectionBySafetyNet="
+ mShouldBlockAutoCorrectionBySafetyNet;
}
} }
public static class SuggestedWordInfo { public static class SuggestedWordInfo {