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

Merge "Null check at BackToAcceptedDefault"

main
satok 2010-07-01 14:45:28 -07:00 committed by Gerrit Code Review
parent a86a942d7c ac108d5b34
commit e8e153490d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1288,7 +1288,7 @@ public class LatinIME extends InputMethodService
doubleSpace();
}
if (pickedDefault) {
TextEntryState.backToAcceptedDefault();
TextEntryState.backToAcceptedDefault(mWord.getTypedWord());
}
updateShiftKeyState(getCurrentInputEditorInfo());
if (ic != null) {

3
java/src/com/android/inputmethod/latin/TextEntryState.java
View File

@ -138,7 +138,8 @@ public class TextEntryState {
// STATE_ACCEPTED_DEFAULT will be changed to other sub-states
// (see "case STATE_ACCEPTED_DEFAULT" in typedCharacter() below),
// and should be restored back to STATE_ACCEPTED_DEFAULT after processing for each sub-state.
public static void backToAcceptedDefault() {
public static void backToAcceptedDefault(CharSequence typedWord) {
if (typedWord == null) return;
switch (sState) {
case STATE_SPACE_AFTER_ACCEPTED:
case STATE_PUNCTUATION_AFTER_ACCEPTED: