diff --git a/res/values-cs/bools.xml b/res/values-cs/bools.xml
new file mode 100644
index 000000000..897f4b3db
--- /dev/null
+++ b/res/values-cs/bools.xml
@@ -0,0 +1,22 @@
+
+
+
+ true
+
diff --git a/res/values-de/bools.xml b/res/values-de/bools.xml
new file mode 100644
index 000000000..897f4b3db
--- /dev/null
+++ b/res/values-de/bools.xml
@@ -0,0 +1,22 @@
+
+
+
+ true
+
diff --git a/res/values-es/bools.xml b/res/values-es/bools.xml
new file mode 100644
index 000000000..897f4b3db
--- /dev/null
+++ b/res/values-es/bools.xml
@@ -0,0 +1,22 @@
+
+
+
+ true
+
diff --git a/res/values-fr/bools.xml b/res/values-fr/bools.xml
new file mode 100644
index 000000000..897f4b3db
--- /dev/null
+++ b/res/values-fr/bools.xml
@@ -0,0 +1,22 @@
+
+
+
+ true
+
diff --git a/res/values-it/bools.xml b/res/values-it/bools.xml
new file mode 100644
index 000000000..897f4b3db
--- /dev/null
+++ b/res/values-it/bools.xml
@@ -0,0 +1,22 @@
+
+
+
+ true
+
diff --git a/res/values-nl/bools.xml b/res/values-nl/bools.xml
new file mode 100644
index 000000000..897f4b3db
--- /dev/null
+++ b/res/values-nl/bools.xml
@@ -0,0 +1,22 @@
+
+
+
+ true
+
diff --git a/res/values-pl/bools.xml b/res/values-pl/bools.xml
new file mode 100644
index 000000000..897f4b3db
--- /dev/null
+++ b/res/values-pl/bools.xml
@@ -0,0 +1,22 @@
+
+
+
+ true
+
diff --git a/res/values/bools.xml b/res/values/bools.xml
new file mode 100644
index 000000000..06aa8f308
--- /dev/null
+++ b/res/values/bools.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ false
+
+ false
+
diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
index 865269907..2fc82aadb 100644
--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -62,7 +62,7 @@
android:title="@string/auto_complete"
android:summary="@string/auto_complete_summary"
android:persistent="true"
- android:defaultValue="true"
+ android:defaultValue="@bool/enable_autocorrect"
android:dependency="show_suggestions"
/>
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);
}