diff options
| author |   satok <satok@google.com> | 2011-04-21 19:11:48 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-04-21 19:11:48 +0900 |
| commit | bbb42bff9ea9a4ae992b3a6a5ed586de914ea4cd (patch) | |
| tree | ba95d17cc205d830cabc05151349ae18b580d594 /java/src/com/android/inputmethod/latin/Settings.java | |
| parent | e75e4463cdd2b9ba672faa6b0b1a6e3083e61543 (diff) | |
| parent | c9c3aa219e56c4707215c28495210a2393ff50c7 (diff) | |
| download | latinime-bbb42bff9ea9a4ae992b3a6a5ed586de914ea4cd.tar.gz latinime-bbb42bff9ea9a4ae992b3a6a5ed586de914ea4cd.tar.xz latinime-bbb42bff9ea9a4ae992b3a6a5ed586de914ea4cd.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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 8f7278e3a..1725ee7aa 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -18,6 +18,7 @@ package com.android.inputmethod.latin; import com.android.inputmethod.compat.CompatUtils; import com.android.inputmethod.compat.InputMethodManagerCompatWrapper; +import com.android.inputmethod.compat.InputMethodServiceCompatWrapper; import com.android.inputmethod.deprecated.VoiceProxy; import com.android.inputmethod.compat.VibratorCompatWrapper; @@ -67,6 +68,7 @@ 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"; @@ -183,6 +185,10 @@ 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 |