1 files changed, 8 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 5ce1b7e95..67a9f3203 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -359,9 +359,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         // 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));
+                    res.getBoolean(R.bool.config_default_recorrection_enabled));
         } else {
-            mReCorrectionEnabled = res.getBoolean(R.bool.default_recorrection_enabled);
+            mReCorrectionEnabled = res.getBoolean(R.bool.config_default_recorrection_enabled);
         }
 
         mConfigEnableShowSubtypeSettings = res.getBoolean(
@@ -1950,7 +1950,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         } else if (Settings.PREF_RECORRECTION_ENABLED.equals(key)) {
             mReCorrectionEnabled = sharedPreferences.getBoolean(
                     Settings.PREF_RECORRECTION_ENABLED,
-                    mResources.getBoolean(R.bool.default_recorrection_enabled));
+                    mResources.getBoolean(R.bool.config_default_recorrection_enabled));
         }
     }
 
@@ -2082,7 +2082,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
 
     private void updateAutoTextEnabled() {
         if (mSuggest == null) return;
-        mSuggest.setAutoTextEnabled(mQuickFixes
+        mSuggest.setQuickFixesEnabled(mQuickFixes
                 && SubtypeSwitcher.getInstance().isSystemLanguageSameAsInputLanguage());
     }
 
@@ -2121,7 +2121,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
         mVibrateOn = vibrator != null && vibrator.hasVibrator()
                 && prefs.getBoolean(Settings.PREF_VIBRATE_ON, false);
-        mSoundOn = prefs.getBoolean(Settings.PREF_SOUND_ON, false);
+        mSoundOn = prefs.getBoolean(Settings.PREF_SOUND_ON,
+                mResources.getBoolean(R.bool.config_default_sound_enabled));
 
         mPopupOn = isPopupEnabled(prefs);
         mAutoCap = prefs.getBoolean(Settings.PREF_AUTO_CAP, true);
@@ -2272,10 +2273,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
                 di.dismiss();
                 switch (position) {
                 case 0:
-                    launchSettings();
+                    mImm.showInputMethodPicker();
                     break;
                 case 1:
-                    mImm.showInputMethodPicker();
+                    launchSettings();
                     break;
                 }
             }