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

Merge "Refactoring"

Browse source
This commit is contained in:
Jean Chalard 2011-12-12 23:39:00 -08:00 committed by Android (Google) Code Review
commit cf5cecccfe
1 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -1411,7 +1411,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
return; return;
} }
final boolean deleteChar = !mHasUncommittedTypedChars;
if (mHasUncommittedTypedChars) { if (mHasUncommittedTypedChars) {
final int length = mWordComposer.size(); final int length = mWordComposer.size();
if (length > 0) { if (length > 0) {
@ -1439,31 +1438,29 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
// If we had uncommitted chars then we know it's not time to revert any auto-correct // If we had uncommitted chars then we know it's not time to revert any auto-correct
// and that spaceState is NONE. // and that spaceState is NONE.
return; return;
}
if (null != mWordSavedForAutoCorrectCancellation) {
Utils.Stats.onAutoCorrectionCancellation();
cancelAutoCorrect(ic);
mWordSavedForAutoCorrectCancellation = null;
return;
} else { } else {
mWordSavedForAutoCorrectCancellation = null; if (null != mWordSavedForAutoCorrectCancellation) {
} Utils.Stats.onAutoCorrectionCancellation();
cancelAutoCorrect(ic);
if (SPACE_STATE_DOUBLE == spaceState) { mWordSavedForAutoCorrectCancellation = null;
if (revertDoubleSpace(ic)) {
// No need to reset mSpaceState, it has already be done (that's why we
// receive it as a parameter)
return; return;
} else {
mWordSavedForAutoCorrectCancellation = null;
}
if (SPACE_STATE_DOUBLE == spaceState) {
if (revertDoubleSpace(ic)) {
// No need to reset mSpaceState, it has already be done (that's why we
// receive it as a parameter)
return;
}
} else if (SPACE_STATE_SWAP_PUNCTUATION == spaceState) {
if (revertSwapPunctuation(ic)) {
// Likewise
return;
}
} }
} else if (SPACE_STATE_SWAP_PUNCTUATION == spaceState) {
if (revertSwapPunctuation(ic)) {
// Likewise
return;
}
}
if (deleteChar) {
if (mSuggestionsView != null && mSuggestionsView.dismissAddToDictionaryHint()) { if (mSuggestionsView != null && mSuggestionsView.dismissAddToDictionaryHint()) {
// Go back to the suggestion mode if the user canceled the // Go back to the suggestion mode if the user canceled the
// "Touch again to save". // "Touch again to save".