nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 1162c053: Merge "Remove dead code" 

* commit '1162c0537d48fcec6dd5dc02594a16d24b4d1008':
  Remove dead code
main
Jean Chalard 2013-08-14 01:38:04 -07:00 committed by Android Git Automerger
parent a05c94747b 1162c0537d
commit 324d4d7290
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -1848,24 +1848,19 @@ 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 (mWordComposer.isBatchMode()) {
if (length > 0) { if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
if (mWordComposer.isBatchMode()) { final String word = mWordComposer.getTypedWord();
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { ResearchLogger.latinIME_handleBackspace_batch(word, 1);
final String word = mWordComposer.getTypedWord();
ResearchLogger.latinIME_handleBackspace_batch(word, 1);
}
final String rejectedSuggestion = mWordComposer.getTypedWord();
mWordComposer.reset();
mWordComposer.setRejectedBatchModeSuggestion(rejectedSuggestion);
} else {
mWordComposer.deleteLast();
} }
mConnection.setComposingText(getTextWithUnderline(mWordComposer.getTypedWord()), 1); final String rejectedSuggestion = mWordComposer.getTypedWord();
mHandler.postUpdateSuggestionStrip(); mWordComposer.reset();
mWordComposer.setRejectedBatchModeSuggestion(rejectedSuggestion);
} else { } else {
mConnection.deleteSurroundingText(1, 0); mWordComposer.deleteLast();
} }
mConnection.setComposingText(getTextWithUnderline(mWordComposer.getTypedWord()), 1);
mHandler.postUpdateSuggestionStrip();
} 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);
} }