From 73f3cd032d311d0aa2280460cde1e885dab0cb83 Mon Sep 17 00:00:00 2001 From: Amith Yamasani <> Date: Mon, 13 Apr 2009 12:27:25 -0700 Subject: AI 145909: Manual merge of CL 145663 from //branches/cupcake/ to //branches/donutburger/ Added -d to the "g4 integrate" command. Automated import of CL 145909 --- src/com/android/inputmethod/latin/LatinIME.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java index a36ff5747..f81637580 100644 --- a/src/com/android/inputmethod/latin/LatinIME.java +++ b/src/com/android/inputmethod/latin/LatinIME.java @@ -1005,7 +1005,8 @@ public class LatinIME extends InputMethodService // will continue to work if (AutoText.getSize(mInputView) < 1) mQuickFixes = true; mShowSuggestions = sp.getBoolean(PREF_SHOW_SUGGESTIONS, true) & mQuickFixes; - mAutoComplete = sp.getBoolean(PREF_AUTO_COMPLETE, true) & mShowSuggestions; + mAutoComplete = sp.getBoolean(PREF_AUTO_COMPLETE, + getResources().getBoolean(R.bool.enable_autocorrect)) & mShowSuggestions; mAutoCorrectOn = mSuggest != null && (mAutoComplete || mQuickFixes); mCorrectionMode = mAutoComplete ? 2 : (mQuickFixes ? 1 : 0); } -- cgit v1.2.3-83-g751a