Merge "Remove a duplicated variable." (86344836) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+24 −32

Original line number	Diff line number	Diff line
		@@ -203,7 +203,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		private boolean mIsSettingsSuggestionStripOn;
		private boolean mApplicationSpecifiedCompletionOn;

		private final StringBuilder mComposingStringBuilder = new StringBuilder();
		private WordComposer mWordComposer = new WordComposer();
		private CharSequence mBestWord;
		private boolean mHasUncommittedTypedChars;
		@@ -756,7 +755,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar

		inputView.closing();
		mEnteredText = null;
		mComposingStringBuilder.setLength(0);
		mWordComposer.reset();
		mHasUncommittedTypedChars = false;
		mDeleteCount = 0;
		mSpaceState = SPACE_STATE_NONE;
		@@ -928,10 +927,10 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		// newly inserted punctuation.
		mSpaceState = SPACE_STATE_NONE;
		}
		if (((mComposingStringBuilder.length() > 0 && mHasUncommittedTypedChars)
		if (((mWordComposer.size() > 0 && mHasUncommittedTypedChars)
		\|\| mVoiceProxy.isVoiceInputHighlighted())
		&& (selectionChanged \|\| candidatesCleared)) {
		mComposingStringBuilder.setLength(0);
		mWordComposer.reset();
		mHasUncommittedTypedChars = false;
		TextEntryState.reset();
		updateSuggestions();
		@@ -1146,13 +1145,14 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		public void commitTyped(final InputConnection ic) {
		if (!mHasUncommittedTypedChars) return;
		mHasUncommittedTypedChars = false;
		if (mComposingStringBuilder.length() > 0) {
		final CharSequence typedWord = mWordComposer.getTypedWord();
		if (typedWord.length() > 0) {
		if (ic != null) {
		ic.commitText(mComposingStringBuilder, 1);
		ic.commitText(typedWord, 1);
		}
		mCommittedLength = mComposingStringBuilder.length();
		TextEntryState.acceptedTyped(mComposingStringBuilder);
		addToUserUnigramAndBigramDictionaries(mComposingStringBuilder,
		mCommittedLength = typedWord.length();
		TextEntryState.acceptedTyped(typedWord);
		addToUserUnigramAndBigramDictionaries(typedWord,
		UserUnigramDictionary.FREQUENCY_FOR_TYPED);
		}
		updateSuggestions();
		@@ -1403,17 +1403,16 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar

		final boolean deleteChar = !mHasUncommittedTypedChars;
		if (mHasUncommittedTypedChars) {
		final int length = mComposingStringBuilder.length();
		final int length = mWordComposer.size();
		if (length > 0) {
		mComposingStringBuilder.delete(length - 1, length);
		mWordComposer.deleteLast();
		final CharSequence textWithUnderline =
		mComposingStateManager.isAutoCorrectionIndicatorOn()
		? SuggestionSpanUtils.getTextWithAutoCorrectionIndicatorUnderline(
		this, mComposingStringBuilder)
		: mComposingStringBuilder;
		this, mWordComposer.getTypedWord())
		: mWordComposer.getTypedWord();
		ic.setComposingText(textWithUnderline, 1);
		if (mComposingStringBuilder.length() == 0) {
		if (mWordComposer.size() == 0) {
		mHasUncommittedTypedChars = false;
		}
		if (1 == length) {
		@@ -1516,7 +1515,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		// Reset entirely the composing state anyway, then start composing a new word unless
		// the character is a single quote.
		mHasUncommittedTypedChars = (Keyboard.CODE_SINGLE_QUOTE != code);
		mComposingStringBuilder.setLength(0);
		mWordComposer.reset();
		clearSuggestions();
		mComposingStateManager.onFinishComposingText();
		@@ -1546,7 +1544,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		}
		}
		if (mHasUncommittedTypedChars) {
		mComposingStringBuilder.append((char) code);
		mWordComposer.add(code, keyCodes, x, y);
		if (ic != null) {
		// If it's the first letter, make note of auto-caps state
		@@ -1557,8 +1554,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		final CharSequence textWithUnderline =
		mComposingStateManager.isAutoCorrectionIndicatorOn()
		? SuggestionSpanUtils.getTextWithAutoCorrectionIndicatorUnderline(
		this, mComposingStringBuilder)
		: mComposingStringBuilder;
		this, mWordComposer.getTypedWord())
		: mWordComposer.getTypedWord();
		ic.setComposingText(textWithUnderline, 1);
		}
		mHandler.postUpdateSuggestions();
		@@ -1746,8 +1743,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		}
		final CharSequence textWithUnderline = newAutoCorrectionIndicator
		? SuggestionSpanUtils.getTextWithAutoCorrectionIndicatorUnderline(
		this, mComposingStringBuilder)
		: mComposingStringBuilder;
		this, mWordComposer.getTypedWord())
		: mWordComposer.getTypedWord();
		if (!TextUtils.isEmpty(textWithUnderline)) {
		ic.setComposingText(textWithUnderline, 1);
		}
		@@ -1940,9 +1937,9 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		} else {
		addToOnlyBigramDictionary(suggestion, 1);
		}
		LatinImeLogger.logOnManualSuggestion(mComposingStringBuilder.toString(),
		LatinImeLogger.logOnManualSuggestion(mWordComposer.getTypedWord().toString(),
		suggestion.toString(), index, suggestions.mWords);
		TextEntryState.acceptedSuggestion(mComposingStringBuilder.toString(), suggestion);
		TextEntryState.acceptedSuggestion(mWordComposer.getTypedWord().toString(), suggestion);
		// Follow it with a space
		if (mInsertSpaceOnPickSuggestionManually) {
		sendMagicSpace();
		@@ -2152,8 +2149,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		private void restartSuggestionsOnWordBeforeCursor(final InputConnection ic,
		final CharSequence word) {
		mWordComposer.setComposingWord(word, mKeyboardSwitcher.getLatinKeyboard());
		mComposingStringBuilder.setLength(0);
		mComposingStringBuilder.append(word);
		// mBestWord will be set appropriately by updateSuggestions() called by the handler
		mBestWord = null;
		mHasUncommittedTypedChars = true;
		@@ -2166,7 +2161,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar

		// "ic" must not be null
		private void revertLastWord(final InputConnection ic) {
		if (mHasUncommittedTypedChars \|\| mComposingStringBuilder.length() <= 0) {
		if (mHasUncommittedTypedChars \|\| mWordComposer.size() <= 0) {
		sendDownUpKeyEvents(KeyEvent.KEYCODE_DEL);
		return;
		}
		@@ -2181,21 +2176,19 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		// the cursor.
		if (!TextUtils.isEmpty(separator)
		&& mSettingsValues.isWordSeparator(separator.charAt(0))
		&& !TextUtils.equals(mComposingStringBuilder, textToTheLeft)) {
		ic.commitText(mComposingStringBuilder, 1);
		TextEntryState.acceptedTyped(mComposingStringBuilder);
		&& !TextUtils.equals(mWordComposer.getTypedWord(), textToTheLeft)) {
		ic.commitText(mWordComposer.getTypedWord(), 1);
		TextEntryState.acceptedTyped(mWordComposer.getTypedWord());
		ic.commitText(separator, 1);
		TextEntryState.typedCharacter(separator.charAt(0), true,
		WordComposer.NOT_A_COORDINATE, WordComposer.NOT_A_COORDINATE);
		// Clear composing text
		mComposingStringBuilder.setLength(0);
		} else {
		// Note: this relies on the last word still being held in the WordComposer
		// Note: in the interest of code simplicity, we may want to just call
		// restartSuggestionsOnWordBeforeCursorIfAtEndOfWord instead, but retrieving
		// the old WordComposer allows to reuse the actual typed coordinates.
		mHasUncommittedTypedChars = true;
		ic.setComposingText(mComposingStringBuilder, 1);
		ic.setComposingText(mWordComposer.getTypedWord(), 1);
		TextEntryState.backspace();
		}
		mHandler.cancelUpdateBigramPredictions();
		@@ -2474,7 +2467,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		final Keyboard keyboard = mKeyboardSwitcher.getLatinKeyboard();
		final int keyboardMode = keyboard != null ? keyboard.mId.mMode : -1;
		p.println(" Keyboard mode = " + keyboardMode);
		p.println(" mComposingStringBuilder=" + mComposingStringBuilder.toString());
		p.println(" mIsSuggestionsRequested=" + mIsSettingsSuggestionStripOn);
		p.println(" mCorrectionMode=" + mCorrectionMode);
		p.println(" mHasUncommittedTypedChars=" + mHasUncommittedTypedChars);

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.inputmethod.latin;
		import com.android.inputmethod.keyboard.Keyboard;
		import com.android.inputmethod.latin.Utils.RingCharBuffer;

		import android.text.TextUtils;
		import android.util.Log;

		public class TextEntryState {
		@@ -45,7 +46,7 @@ public class TextEntryState {

		public static void acceptedDefault(CharSequence typedWord, CharSequence actualWord,
		int separatorCode) {
		if (typedWord == null) return;
		if (TextUtils.isEmpty(typedWord)) return;
		setState(ACCEPTED_DEFAULT);
		LatinImeLogger.logOnAutoCorrection(
		typedWord.toString(), actualWord.toString(), separatorCode);
		@@ -57,7 +58,7 @@ public class TextEntryState {
		// (see "case ACCEPTED_DEFAULT" in typedCharacter() below),
		// and should be restored back to State.ACCEPTED_DEFAULT after processing for each sub-state.
		public static void backToAcceptedDefault(CharSequence typedWord) {
		if (typedWord == null) return;
		if (TextUtils.isEmpty(typedWord)) return;
		switch (sState) {
		case SPACE_AFTER_ACCEPTED:
		case PUNCTUATION_AFTER_ACCEPTED:

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -231,9 +231,6 @@ public class WordComposer {
		* @return the word that was typed so far
		*/
		public String getTypedWord() {
		if (size() == 0) {
		return null;
		}
		return mTypedWord.toString();
		}