diff options
| author |   Jean Chalard <jchalard@google.com> | 2011-01-18 22:02:50 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-01-18 22:02:50 -0800 |
| commit | 25952f8d9634bbadaedcb2d8c0f8606f71901638 (patch) | |
| tree | 9c936392fc4786c47adcfcd1bebf057e84109e8b /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | 7c3a7616d26eb0f09bf39247abc224032575c73a (diff) | |
| parent | b66c0c2a18874cd215408d1a5e872ee0db5f38b9 (diff) | |
| download | latinime-25952f8d9634bbadaedcb2d8c0f8606f71901638.tar.gz latinime-25952f8d9634bbadaedcb2d8c0f8606f71901638.tar.xz latinime-25952f8d9634bbadaedcb2d8c0f8606f71901638.zip | |
am b66c0c2a: am 8b0febc6: Merge "Simplify latin IME settings page." into honeycomb
* commit 'b66c0c2a18874cd215408d1a5e872ee0db5f38b9':
Simplify latin IME settings page.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 4b218a333..5d48d6b36 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( |