Cleanup (A9)

Deactivate the LastComposedWord when the commit was not the right
type, instead of fooling it by passing it a null auto-correction.

Change-Id: I032b477dc691bd151a644ca4b0c9f0a9b5512e45
main
Jean Chalard 2012-01-26 19:05:59 +09:00
parent 5971a0a0bb
commit 449415c72f
1 changed files with 4 additions and 2 deletions

View File

@ -311,8 +311,10 @@ public class WordComposer {
// instead of only on cancel), and ultimately we want to figure it out even earlier anyway. // instead of only on cancel), and ultimately we want to figure it out even earlier anyway.
final LastComposedWord lastComposedWord = new LastComposedWord(mCodes, final LastComposedWord lastComposedWord = new LastComposedWord(mCodes,
mXCoordinates, mYCoordinates, mTypedWord.toString(), mXCoordinates, mYCoordinates, mTypedWord.toString(),
(type != LastComposedWord.COMMIT_TYPE_DECIDED_WORD) || (null == mAutoCorrection) null == mAutoCorrection ? null : mAutoCorrection.toString());
? null : mAutoCorrection.toString()); if (type != LastComposedWord.COMMIT_TYPE_DECIDED_WORD) {
lastComposedWord.deactivate();
}
mCodes.clear(); mCodes.clear();
mTypedWord.setLength(0); mTypedWord.setLength(0);
mAutoCorrection = null; mAutoCorrection = null;