Merge "Remember auto-correction status simply (B1)"

main
Jean Chalard 2012-03-08 00:54:30 -08:00 committed by Android (Google) Code Review
commit fbe767cec5
1 changed files with 3 additions and 0 deletions

View File

@ -240,6 +240,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
private final ComposingStateManager mComposingStateManager = private final ComposingStateManager mComposingStateManager =
ComposingStateManager.getInstance(); ComposingStateManager.getInstance();
private boolean mIsAutoCorrectionIndicatorOn;
public final UIHandler mHandler = new UIHandler(this); public final UIHandler mHandler = new UIHandler(this);
@ -1339,6 +1340,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
// all inputs that do not result in a special state. Each character handling is then // all inputs that do not result in a special state. Each character handling is then
// free to override the state as they see fit. // free to override the state as they see fit.
final int spaceState = mSpaceState; final int spaceState = mSpaceState;
if (!mWordComposer.isComposingWord()) mIsAutoCorrectionIndicatorOn = false;
// TODO: Consolidate the double space timer, mLastKeyTime, and the space state. // TODO: Consolidate the double space timer, mLastKeyTime, and the space state.
if (primaryCode != Keyboard.CODE_SPACE) { if (primaryCode != Keyboard.CODE_SPACE) {
@ -1796,6 +1798,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
+ " -> " + newAutoCorrectionIndicator); + " -> " + newAutoCorrectionIndicator);
} }
if (mWordComposer.isComposingWord()) { if (mWordComposer.isComposingWord()) {
mIsAutoCorrectionIndicatorOn = newAutoCorrectionIndicator;
final CharSequence textWithUnderline = final CharSequence textWithUnderline =
getTextWithUnderline(mWordComposer.getTypedWord()); getTextWithUnderline(mWordComposer.getTypedWord());
ic.setComposingText(textWithUnderline, 1); ic.setComposingText(textWithUnderline, 1);