diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-05-23 16:43:36 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-05-23 16:43:37 +0000 |
| commit | 7a76350b7b7c500d12d0f1e8e15fd2ea8b4d3035 (patch) | |
| tree | a4830b046c7b70d93fee8d959518746764207a50 /java/src/com/android/inputmethod/latin/settings/SettingsValues.java | |
| parent | 6726bc90014c8d9c1710e4b52aa019d3e945f407 (diff) | |
| parent | 7ed40a13cc8d8a616fd131e5644238cd41aba84d (diff) | |
| download | latinime-7a76350b7b7c500d12d0f1e8e15fd2ea8b4d3035.tar.gz latinime-7a76350b7b7c500d12d0f1e8e15fd2ea8b4d3035.tar.xz latinime-7a76350b7b7c500d12d0f1e8e15fd2ea8b4d3035.zip | |
Merge "Enable "show language switch key" settings on K and before"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/SettingsValues.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsValues.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index d97323ba8..58ef75b96 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -125,9 +125,11 @@ public final class SettingsValues { final String autoCorrectionThresholdRawValue = prefs.getString( Settings.PREF_AUTO_CORRECTION_THRESHOLD, res.getString(R.string.auto_correction_threshold_mode_index_modest)); - mIncludesOtherImesInLanguageSwitchList = prefs.getBoolean( - Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST, false); - mShowsLanguageSwitchKey = Settings.readShowsLanguageSwitchKey(prefs); + mIncludesOtherImesInLanguageSwitchList = Settings.ENABLE_SHOW_LANGUAGE_SWITCH_KEY_SETTINGS + ? prefs.getBoolean(Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST, false) + : true /* forcibly */; + mShowsLanguageSwitchKey = Settings.ENABLE_SHOW_LANGUAGE_SWITCH_KEY_SETTINGS + ? Settings.readShowsLanguageSwitchKey(prefs) : true /* forcibly */; mUseContactsDict = prefs.getBoolean(Settings.PREF_KEY_USE_CONTACTS_DICT, true); mUsePersonalizedDicts = prefs.getBoolean(Settings.PREF_KEY_USE_PERSONALIZED_DICTS, true); mUseDoubleSpacePeriod = prefs.getBoolean(Settings.PREF_KEY_USE_DOUBLE_SPACE_PERIOD, true); |