am 1162c053: Merge "Remove dead code"

* commit '1162c0537d48fcec6dd5dc02594a16d24b4d1008':
  Remove dead code
This commit is contained in:
Jean Chalard 2013-08-14 01:38:04 -07:00 committed by Android Git Automerger
commit 324d4d7290

View File

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