am 43d3f0fa: Merge "Auto-correct after smileys and gestures." into jb-mr1-dev

* commit '43d3f0fa3bd804e9795d31025b78a4696d46f0a2':
  Auto-correct after smileys and gestures.
This commit is contained in:
Jean Chalard 2012-08-28 02:01:13 -07:00 committed by Android Git Automerger
commit 4a02e84f76

View file

@ -1351,7 +1351,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
@Override @Override
public void onTextInput(CharSequence rawText) { public void onTextInput(CharSequence rawText) {
mConnection.beginBatchEdit(); mConnection.beginBatchEdit();
commitTyped(LastComposedWord.NOT_A_SEPARATOR); if (mWordComposer.isComposingWord()) {
commitCurrentAutoCorrection(LastComposedWord.NOT_A_SEPARATOR);
}
mHandler.postUpdateSuggestionStrip(); mHandler.postUpdateSuggestionStrip();
final CharSequence text = specificTldProcessingOnTextInput(rawText); final CharSequence text = specificTldProcessingOnTextInput(rawText);
if (SPACE_STATE_PHANTOM == mSpaceState) { if (SPACE_STATE_PHANTOM == mSpaceState) {
@ -1370,7 +1372,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
public void onStartBatchInput() { public void onStartBatchInput() {
mConnection.beginBatchEdit(); mConnection.beginBatchEdit();
if (mWordComposer.isComposingWord()) { if (mWordComposer.isComposingWord()) {
commitTyped(LastComposedWord.NOT_A_SEPARATOR); commitCurrentAutoCorrection(LastComposedWord.NOT_A_SEPARATOR);
mExpectingUpdateSelection = true; mExpectingUpdateSelection = true;
// TODO: Can we remove this? // TODO: Can we remove this?
mSpaceState = SPACE_STATE_PHANTOM; mSpaceState = SPACE_STATE_PHANTOM;