diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values-xlarge/config.xml | 1 | ||||
| -rw-r--r-- | java/res/values/config.xml | 1 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 14 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 12 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 6 |
5 files changed, 25 insertions, 9 deletions
diff --git a/java/res/values-xlarge/config.xml b/java/res/values-xlarge/config.xml index 912971793..d6864608d 100644 --- a/java/res/values-xlarge/config.xml +++ b/java/res/values-xlarge/config.xml @@ -23,6 +23,7 @@ <bool name="config_enable_show_subtype_settings">false</bool> <bool name="config_enable_show_voice_key_option">false</bool> <bool name="config_enable_show_popup_on_keypress_option">false</bool> + <bool name="config_enable_show_recorrection_option">false</bool> <bool name="config_candidate_highlight_font_color_enabled">false</bool> <bool name="config_swipe_down_dismiss_keyboard_enabled">false</bool> <bool name="config_sliding_key_input_enabled">false</bool> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index e5821075e..a523635ca 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -26,6 +26,7 @@ <bool name="config_enable_show_subtype_settings">true</bool> <bool name="config_enable_show_voice_key_option">true</bool> <bool name="config_enable_show_popup_on_keypress_option">true</bool> + <bool name="config_enable_show_recorrection_option">true</bool> <bool name="config_candidate_highlight_font_color_enabled">true</bool> <bool name="config_swipe_down_dismiss_keyboard_enabled">true</bool> <bool name="config_sliding_key_input_enabled">true</bool> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 9c780cb2d..4bcb1d7d8 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -19,6 +19,13 @@ android:key="english_ime_settings"> <CheckBoxPreference + android:key="auto_cap" + android:title="@string/auto_cap" + android:persistent="true" + android:defaultValue="true" + /> + + <CheckBoxPreference android:key="vibrate_on" android:title="@string/vibrate_on_keypress" android:persistent="true" @@ -45,13 +52,6 @@ android:defaultValue="@bool/default_recorrection_enabled" /> - <CheckBoxPreference - android:key="auto_cap" - android:title="@string/auto_cap" - android:persistent="true" - android:defaultValue="true" - /> - <ListPreference android:key="settings_key" android:title="@string/prefs_settings_key" 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 |