diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-05-20 03:02:14 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-05-20 03:02:14 -0700 |
| commit | 20e16475e686d84b890c5d845675f20ce59665d1 (patch) | |
| tree | 4d386c32dc88211e6585f878c2c02f733ab516e2 /java/src/com/android/inputmethod/latin/Settings.java | |
| parent | 29a4b1ac88b06ced0ceb0b36ec4aedb7692447f7 (diff) | |
| parent | d794c6f0788a65a4ec623de3f8f05122621d665f (diff) | |
| download | latinime-20e16475e686d84b890c5d845675f20ce59665d1.tar.gz latinime-20e16475e686d84b890c5d845675f20ce59665d1.tar.xz latinime-20e16475e686d84b890c5d845675f20ce59665d1.zip | |
Merge "Remove manual config item controlling to show input language settings"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Settings.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index d64410a3d..956c51e06 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -87,7 +87,6 @@ public class Settings extends PreferenceActivity public static class Values { // From resources: - public final boolean mEnableShowSubtypeSettings; public final boolean mSwipeDownDismissKeyboardEnabled; public final int mDelayBeforeFadeoutLanguageOnSpacebar; public final int mDelayUpdateSuggestions; @@ -128,8 +127,6 @@ public class Settings extends PreferenceActivity } // Get the resources - mEnableShowSubtypeSettings = res.getBoolean( - R.bool.config_enable_show_subtype_settings); mSwipeDownDismissKeyboardEnabled = res.getBoolean( R.bool.config_swipe_down_dismiss_keyboard_enabled); mDelayBeforeFadeoutLanguageOnSpacebar = res.getInteger( @@ -371,10 +368,7 @@ public class Settings extends PreferenceActivity generalSettings.removePreference(findPreference(PREF_VIBRATE_ON)); } - final boolean showSubtypeSettings = res.getBoolean( - R.bool.config_enable_show_subtype_settings); - if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED - && !showSubtypeSettings) { + if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED) { generalSettings.removePreference(findPreference(PREF_SUBTYPES)); } |