Move a method to a more sensical place. (9b018902) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1847,7 +1847,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		autoCorrection = null;
		}
		mWordComposer.setAutoCorrection(autoCorrection);
		final boolean isAutoCorrection = Utils.willAutoCorrect(suggestedWords);
		final boolean isAutoCorrection = suggestedWords.willAutoCorrect();
		setSuggestions(suggestedWords, isAutoCorrection);
		setAutoCorrectionIndicator(isAutoCorrection);
		setSuggestionStripShown(isSuggestionsStripVisible());

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,11 @@ public class SuggestedWords {
		return mShouldBlockAutoCorrectionBySafetyNet;
		}

		public boolean willAutoCorrect() {
		return !mTypedWordValid && mHasAutoCorrectionCandidate
		&& !shouldBlockAutoCorrectionBySafetyNet();
		}

		public static class Builder {
		private List<CharSequence> mWords = new ArrayList<CharSequence>();
		private boolean mTypedWordValid;

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -778,11 +778,6 @@ public class Utils {
		return s.toUpperCase(locale).charAt(0) + s.substring(1);
		}

		public static boolean willAutoCorrect(SuggestedWords suggestions) {
		return !suggestions.mTypedWordValid && suggestions.mHasAutoCorrectionCandidate
		&& !suggestions.shouldBlockAutoCorrectionBySafetyNet();
		}

		public static class Stats {
		public static void onNonSeparator(final char code, final int x,
		final int y) {

java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -62,7 +62,6 @@ import com.android.inputmethod.latin.R;
		import com.android.inputmethod.latin.StaticInnerHandlerWrapper;
		import com.android.inputmethod.latin.SuggestedWords;
		import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
		import com.android.inputmethod.latin.Utils;

		import java.util.ArrayList;
		import java.util.List;
		@@ -261,7 +260,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,

		private CharSequence getStyledSuggestionWord(SuggestedWords suggestions, int pos) {
		final CharSequence word = suggestions.getWord(pos);
		final boolean isAutoCorrect = pos == 1 && Utils.willAutoCorrect(suggestions);
		final boolean isAutoCorrect = pos == 1 && suggestions.willAutoCorrect();
		final boolean isTypedWordValid = pos == 0 && suggestions.mTypedWordValid;
		if (!isAutoCorrect && !isTypedWordValid)
		return word;
		@@ -282,7 +281,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
		private int getWordPosition(int index, SuggestedWords suggestions) {
		// TODO: This works for 3 suggestions. Revisit this algorithm when there are 5 or more
		// suggestions.
		final int centerPos = Utils.willAutoCorrect(suggestions) ? 1 : 0;
		final int centerPos = suggestions.willAutoCorrect() ? 1 : 0;
		if (index == mCenterSuggestionIndex) {
		return centerPos;
		} else if (index == centerPos) {
		@@ -297,7 +296,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
		final boolean isSuggested = (pos != 0);

		final int color;
		if (index == mCenterSuggestionIndex && Utils.willAutoCorrect(suggestions)) {
		if (index == mCenterSuggestionIndex && suggestions.willAutoCorrect()) {
		color = mColorAutoCorrect;
		} else if (index == mCenterSuggestionIndex && suggestions.mTypedWordValid) {
		color = mColorValidTypedWord;