diff options
| author |   satok <satok@google.com> | 2010-07-01 14:45:28 -0700 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit2@ppgnte-ubiq63.twd.corp.google.com> | 2010-07-01 14:45:28 -0700 |
| commit | e8e153490d4b3a9d0cea7cd86f49d56259c7df27 (patch) | |
| tree | 0935f0f3115be0a2ace298b59230a700a7898f59 /java/src | |
| parent | a86a942d7c95c1ab1225f705f712383258b4d614 (diff) | |
| parent | ac108d5b341f484d48009ba0e90524569bab84f2 (diff) | |
| download | latinime-e8e153490d4b3a9d0cea7cd86f49d56259c7df27.tar.gz latinime-e8e153490d4b3a9d0cea7cd86f49d56259c7df27.tar.xz latinime-e8e153490d4b3a9d0cea7cd86f49d56259c7df27.zip | |
Merge "Null check at BackToAcceptedDefault"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/TextEntryState.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 756cd2327..7612426eb 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1288,7 +1288,7 @@ public class LatinIME extends InputMethodService doubleSpace(); } if (pickedDefault) { - TextEntryState.backToAcceptedDefault(); + TextEntryState.backToAcceptedDefault(mWord.getTypedWord()); } updateShiftKeyState(getCurrentInputEditorInfo()); if (ic != null) { diff --git a/java/src/com/android/inputmethod/latin/TextEntryState.java b/java/src/com/android/inputmethod/latin/TextEntryState.java index 1a3bb877a..224423c23 100644 --- a/java/src/com/android/inputmethod/latin/TextEntryState.java +++ b/java/src/com/android/inputmethod/latin/TextEntryState.java @@ -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: |