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

am cf5ceccc: Merge "Refactoring" 

* commit 'cf5cecccfe84b316169f01ec1bc2b92361330002':
  Refactoring
main
Jean Chalard 2011-12-13 05:48:19 -08:00 committed by Android Git Automerger
parent 675dce894c cf5cecccfe
commit 27f1554ad5
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;
}
final boolean deleteChar = !mHasUncommittedTypedChars;
if (mHasUncommittedTypedChars) {
final int length = mWordComposer.size();
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
// and that spaceState is NONE.
return;
}
if (null != mWordSavedForAutoCorrectCancellation) {
Utils.Stats.onAutoCorrectionCancellation();
cancelAutoCorrect(ic);
mWordSavedForAutoCorrectCancellation = null;
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)
if (null != mWordSavedForAutoCorrectCancellation) {
Utils.Stats.onAutoCorrectionCancellation();
cancelAutoCorrect(ic);
mWordSavedForAutoCorrectCancellation = null;
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()) {
// Go back to the suggestion mode if the user canceled the
// "Touch again to save".