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

am 81a4b7f4: Merge "Fix a bug in gesture after a dash or apostrophe" 

* commit '81a4b7f48e0649c1b984fd25398f45ce813f7cbf':
  Fix a bug in gesture after a dash or apostrophe
main
Jean Chalard 2013-01-18 00:42:59 -08:00 committed by Android Git Automerger
parent 132b94dd07 81a4b7f48e
commit 2d3858ab57
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1484,7 +1484,10 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
Stats.onAutoCorrection("", mWordComposer.getTypedWord(), " ", mWordComposer); Stats.onAutoCorrection("", mWordComposer.getTypedWord(), " ", mWordComposer);
} }
} }
if (mWordComposer.size() <= 1) { final int wordComposerSize = mWordComposer.size();
// Since isComposingWord() is true, the size is at least 1.
final int lastChar = mWordComposer.getCodeAt(wordComposerSize - 1);
if (wordComposerSize <= 1) {
// We auto-correct the previous (typed, not gestured) string iff it's one character // We auto-correct the previous (typed, not gestured) string iff it's one character
// long. The reason for this is, even in the middle of gesture typing, you'll still // long. The reason for this is, even in the middle of gesture typing, you'll still
// tap one-letter words and you want them auto-corrected (typically, "i" in English // tap one-letter words and you want them auto-corrected (typically, "i" in English
@ -1498,8 +1501,14 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
} }
mExpectingUpdateSelection = true; mExpectingUpdateSelection = true;
// The following is necessary for the case where the user typed something but didn't // The following is necessary for the case where the user typed something but didn't
// manual pick it and didn't input any separator. // manual pick it and didn't input any separator: we want to put a space between what
// has been entered and the coming gesture input result, so we go into phantom space
// state, which will be promoted to a space when the gesture result is committed. But if
// the current input ends in a word connector on the other hand, then we want to have
// the next input stick to the current input so we don't switch to phantom space state.
if (!mSettings.getCurrent().isWordConnector(lastChar)) {
mSpaceState = SPACE_STATE_PHANTOM; mSpaceState = SPACE_STATE_PHANTOM;
}
} else { } else {
final int codePointBeforeCursor = mConnection.getCodePointBeforeCursor(); final int codePointBeforeCursor = mConnection.getCodePointBeforeCursor();
if (mSettings.getCurrent().isUsuallyFollowedBySpace(codePointBeforeCursor)) { if (mSettings.getCurrent().isUsuallyFollowedBySpace(codePointBeforeCursor)) {