Merge "Kill the last place where the Builder was being used" (7d384c73) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/LatinIME.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -1977,23 +1977,23 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		return;
		}

		final SuggestedWords.Builder builder;
		final SuggestedWords suggestedWords;
		if (mCorrectionMode == Suggest.CORRECTION_FULL_BIGRAM) {
		final CharSequence prevWord = EditingUtils.getThisWord(getCurrentInputConnection(),
		mSettingsValues.mWordSeparators);
		if (!TextUtils.isEmpty(prevWord)) {
		builder = mSuggest.getBigramPredictionWordBuilder(prevWord);
		suggestedWords = mSuggest.getBigramPredictionWordBuilder(prevWord).build();
		} else {
		builder = null;
		suggestedWords = null;
		}
		} 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
		// showSuggestions will retrieve the word near the cursor, we don't want that here)
		showSuggestions(builder.build(), "");
		showSuggestions(suggestedWords, "");
		} else {
		if (!isShowingPunctuationList()) setPunctuationSuggestions();
		}

+0 −23

Original line number	Diff line number	Diff line
		@@ -141,29 +141,6 @@ public class SuggestedWords {
		mIsPunctuationSuggestions, mShouldBlockAutoCorrectionBySafetyNet,
		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 {