diff options
| author |   satok <satok@google.com> | 2011-04-22 00:14:38 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-04-22 00:14:38 +0900 |
| commit | bf6ab28ae30e874b31660d5910728c41b7bc991a (patch) | |
| tree | 404340e577775c07f08a93d406f381521ab7bec0 /java/src/com/android/inputmethod/latin/Settings.java | |
| parent | bbb42bff9ea9a4ae992b3a6a5ed586de914ea4cd (diff) | |
| parent | 1b9eecb521862b4e75b0a34623efdc98087d75ba (diff) | |
| download | latinime-bf6ab28ae30e874b31660d5910728c41b7bc991a.tar.gz latinime-bf6ab28ae30e874b31660d5910728c41b7bc991a.tar.xz latinime-bf6ab28ae30e874b31660d5910728c41b7bc991a.zip | |
Merge remote-tracking branch 'goog/master' into merge
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, 2 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 1725ee7aa..6a0b7b009 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -68,7 +68,6 @@ public class Settings extends PreferenceActivity public static final String PREF_AUTO_CORRECTION_THRESHOLD = "auto_correction_threshold"; public static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion"; public static final String PREF_DEBUG_SETTINGS = "debug_settings"; - public static final String PREF_LANGUAGE_SELECTION = "language_selection"; public static final String PREF_USABILITY_STUDY_MODE = "usability_study_mode"; @@ -152,7 +151,8 @@ public class Settings extends PreferenceActivity final boolean showSubtypeSettings = getResources().getBoolean( R.bool.config_enable_show_subtype_settings); - if (!showSubtypeSettings) { + if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED + && !showSubtypeSettings) { generalSettings.removePreference(findPreference(PREF_SUBTYPES)); } @@ -185,10 +185,6 @@ public class Settings extends PreferenceActivity if (!showUsabilityModeStudyOption) { getPreferenceScreen().removePreference(findPreference(PREF_USABILITY_STUDY_MODE)); } - - if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED) { - generalSettings.removePreference(findPreference(PREF_LANGUAGE_SELECTION)); - } } @Override |