diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-08-05 22:49:27 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-05 22:49:27 -0700 |
| commit | d299bde24b4afd3955fa65c7ab372807a336c6df (patch) | |
| tree | d25fb3833fa934a62b3800d451394540a5cc5fd3 /java/src | |
| parent | 56b6c269f292dcbfb4832d13624cc87e20ef5f4f (diff) | |
| parent | 76bfe7f7b0f6b231e0596e400620cd34265a044f (diff) | |
| download | latinime-d299bde24b4afd3955fa65c7ab372807a336c6df.tar.gz latinime-d299bde24b4afd3955fa65c7ab372807a336c6df.tar.xz latinime-d299bde24b4afd3955fa65c7ab372807a336c6df.zip | |
am 76bfe7f7: am 44f12ed9: Merge "Separate updateSuggestionStrip from commitTyped" into jb-mr1-dev
* commit '76bfe7f7b0f6b231e0596e400620cd34265a044f':
Separate updateSuggestionStrip from commitTyped
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 60f1a204b..a7446695e 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -545,8 +545,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen commitTyped(LastComposedWord.NOT_A_SEPARATOR); mConnection.finishComposingText(); mConnection.endBatchEdit(); - if (isShowingOptionDialog()) + if (isShowingOptionDialog()) { mOptionsDialog.dismiss(); + } } super.onConfigurationChanged(conf); } @@ -1046,7 +1047,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen LastComposedWord.COMMIT_TYPE_USER_TYPED_WORD, typedWord.toString(), separatorCode, prevWord); } - updateSuggestionStrip(); } // Called from the KeyboardSwitcher which needs to know auto caps state to display @@ -1319,10 +1319,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen // Called from PointerTracker through the KeyboardActionListener interface @Override - public void onTextInput(CharSequence text) { + public void onTextInput(CharSequence rawText) { mConnection.beginBatchEdit(); commitTyped(LastComposedWord.NOT_A_SEPARATOR); - text = specificTldProcessingOnTextInput(text); + mHandler.postUpdateSuggestionStrip(); + final CharSequence text = specificTldProcessingOnTextInput(rawText); if (SPACE_STATE_PHANTOM == mSpaceState) { sendKeyCodePoint(Keyboard.CODE_SPACE); } @@ -1659,8 +1660,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen commitTyped(LastComposedWord.NOT_A_SEPARATOR); requestHideSelf(0); MainKeyboardView inputView = mKeyboardSwitcher.getKeyboardView(); - if (inputView != null) + if (inputView != null) { inputView.closing(); + } } // TODO: make this private |