am c6e404e0: am 3bf113f0: Merge "Mark 2 resolved TODOS as such (A14)" into jb-mr1-dev

* commit 'c6e404e0e88446fb8c0499fb903bf29785b04816':
  Mark 2 resolved TODOS as such (A14)
This commit is contained in:
Jean Chalard 2012-09-19 15:18:42 -07:00 committed by Android Git Automerger
commit 3a637a2371

View file

@ -1391,11 +1391,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (mWordComposer.isComposingWord()) { if (mWordComposer.isComposingWord()) {
commitTyped(LastComposedWord.NOT_A_SEPARATOR); commitTyped(LastComposedWord.NOT_A_SEPARATOR);
mExpectingUpdateSelection = true; mExpectingUpdateSelection = true;
// TODO: Can we remove this? // The following is necessary for the case where the user typed something but didn't
// manual pick it and didn't input any separator.
mSpaceState = SPACE_STATE_PHANTOM; mSpaceState = SPACE_STATE_PHANTOM;
} }
mConnection.endBatchEdit(); mConnection.endBatchEdit();
// TODO: Should handle TextUtils.CAP_MODE_CHARACTER.
mWordComposer.setCapitalizedModeAtStartComposingTime(getActualCapsMode()); mWordComposer.setCapitalizedModeAtStartComposingTime(getActualCapsMode());
} }