am 1162c053: Merge "Remove dead code" (324d4d72) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+11 −17

Original line number	Diff line number	Diff line
		@@ -1848,8 +1848,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		// When we exit this if-clause, mWordComposer.isComposingWord() will return false.
		}
		if (mWordComposer.isComposingWord()) {
		final int length = mWordComposer.size();
		if (length > 0) {
		if (mWordComposer.isBatchMode()) {
		if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
		final String word = mWordComposer.getTypedWord();
		@@ -1863,9 +1861,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		}
		mConnection.setComposingText(getTextWithUnderline(mWordComposer.getTypedWord()), 1);
		mHandler.postUpdateSuggestionStrip();
		} else {
		mConnection.deleteSurroundingText(1, 0);
		}
		} else {
		final SettingsValues currentSettings = mSettings.getCurrent();
		if (mLastComposedWord.canRevertCommit()) {
		@@ -1879,8 +1874,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		// Cancel multi-character input: remove the text we just entered.
		// This is triggered on backspace after a key that inputs multiple characters,
		// like the smiley key or the .com key.
		final int length = mEnteredText.length();
		mConnection.deleteSurroundingText(length, 0);
		mConnection.deleteSurroundingText(mEnteredText.length(), 0);
		if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
		ResearchLogger.latinIME_handleBackspace_cancelTextInput(mEnteredText);
		}