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

am fac619a3: Merge "Don\'t restrict reset composing state to non-identical setText" into jb-mr1.1-dev 

* commit 'fac619a34c8101cac504db500d74114dc8768372':
  Don't restrict reset composing state to non-identical setText
main
Jean Chalard 2012-11-12 23:02:34 -08:00 committed by Android Git Automerger
parent a13a8a58e0 fac619a34c
commit 7d34763e23
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -704,21 +704,17 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
updateFullscreenMode(); updateFullscreenMode();
mApplicationSpecifiedCompletions = null; mApplicationSpecifiedCompletions = null;
if (isDifferentTextField || selectionChanged) { // The app calling setText() has the effect of clearing the composing
// If the selection changed, we reset the input state. Essentially, we come here with // span, so we should reset our state unconditionally, even if restarting is true.
// restarting == true when the app called setText() or similar. We should reset the mEnteredText = null;
// state if the app set the text to something else, but keep it if it set a suggestion resetComposingState(true /* alsoResetLastComposedWord */);
// or something. mDeleteCount = 0;
mEnteredText = null; mSpaceState = SPACE_STATE_NONE;
resetComposingState(true /* alsoResetLastComposedWord */);
mDeleteCount = 0;
mSpaceState = SPACE_STATE_NONE;
if (mSuggestionStripView != null) { if (mSuggestionStripView != null) {
// This will set the punctuation suggestions if next word suggestion is off; // This will set the punctuation suggestions if next word suggestion is off;
// otherwise it will clear the suggestion strip. // otherwise it will clear the suggestion strip.
setPunctuationSuggestions(); setPunctuationSuggestions();
}
} }
mConnection.resetCachesUponCursorMove(editorInfo.initialSelStart); mConnection.resetCachesUponCursorMove(editorInfo.initialSelStart);