Merge "Use the simple auto-correction status (B2)"

This commit is contained in:
Jean Chalard 2012-03-08 01:12:46 -08:00 committed by Android (Google) Code Review
commit d8447ec353

View File

@ -1713,7 +1713,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
}
private CharSequence getTextWithUnderline(final CharSequence text) {
return mComposingStateManager.isAutoCorrectionIndicatorOn()
return mIsAutoCorrectionIndicatorOn
? SuggestionSpanUtils.getTextWithAutoCorrectionIndicatorUnderline(this, text)
: text;
}
@ -1791,7 +1791,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
if (ic != null) {
final boolean oldAutoCorrectionIndicator =
mComposingStateManager.isAutoCorrectionIndicatorOn();
if (oldAutoCorrectionIndicator != newAutoCorrectionIndicator) {
if (mIsAutoCorrectionIndicatorOn != newAutoCorrectionIndicator) {
mComposingStateManager.setAutoCorrectionIndicatorOn(newAutoCorrectionIndicator);
if (DEBUG) {
Log.d(TAG, "Flip the indicator. " + oldAutoCorrectionIndicator