aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/android/inputmethod/latin/LatinIME.java
diff options
context:
space:
mode:
authorAmith Yamasani <>2009-04-13 12:27:25 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-13 12:27:25 -0700
commit73f3cd032d311d0aa2280460cde1e885dab0cb83 (patch)
tree3f2bb3d7a740a5678df3d7ad01a0d61afc85a1e2 /src/com/android/inputmethod/latin/LatinIME.java
parentb9bb42654758027f139616c661d35b9e65046e80 (diff)
downloadlatinime-73f3cd032d311d0aa2280460cde1e885dab0cb83.tar.gz
latinime-73f3cd032d311d0aa2280460cde1e885dab0cb83.tar.xz
latinime-73f3cd032d311d0aa2280460cde1e885dab0cb83.zip
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
Diffstat (limited to 'src/com/android/inputmethod/latin/LatinIME.java')
-rw-r--r--src/com/android/inputmethod/latin/LatinIME.java3
1 files changed, 2 insertions, 1 deletions
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);
}