2 files changed, 16 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index cd4143e78..d5844b51c 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -353,8 +353,16 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
 
         final Resources res = getResources();
         mResources = res;
-        mReCorrectionEnabled = prefs.getBoolean(Settings.PREF_RECORRECTION_ENABLED,
-                res.getBoolean(R.bool.default_recorrection_enabled));
+
+        // If the option should not be shown, do not read the recorrection preference
+        // but always use the default setting defined in the resources.
+        if (res.getBoolean(R.bool.config_enable_show_recorrection_option)) {
+            mReCorrectionEnabled = prefs.getBoolean(Settings.PREF_RECORRECTION_ENABLED,
+                    res.getBoolean(R.bool.default_recorrection_enabled));
+        } else {
+            mReCorrectionEnabled = res.getBoolean(R.bool.default_recorrection_enabled);
+        }
+
         mConfigSwipeDownDismissKeyboardEnabled = res.getBoolean(
                 R.bool.config_swipe_down_dismiss_keyboard_enabled);
         mConfigDelayBeforeFadeoutLanguageOnSpacebar = res.getInteger(
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index 5db63b719..75ebbe7e5 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -140,6 +140,12 @@ public class Settings extends PreferenceActivity
         if (!showPopupOption) {
             getPreferenceScreen().removePreference(findPreference(PREF_POPUP_ON));
         }
+
+        final boolean showRecorrectionOption = getResources().getBoolean(
+                R.bool.config_enable_show_recorrection_option);
+        if (!showRecorrectionOption) {
+            getPreferenceScreen().removePreference(findPreference(PREF_RECORRECTION_ENABLED));
+        }
     }
 
     @Override