diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 7 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index a6ef5e533..6c33cacd5 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -303,8 +303,6 @@ <!-- Title for input language selection screen --> <string name="language_selection_title">Input languages</string> - <!-- Title summary for input language selection screen --> - <string name="language_selection_summary">Slide finger on spacebar to change language</string> <!-- Add to dictionary hint --> <string name="hint_add_to_dictionary">\u2190 Touch again to save</string> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index f68ee0168..734c6dc79 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -18,6 +18,9 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/english_ime_settings" android:key="english_ime_settings"> + <PreferenceScreen + android:key="subtype_settings" + android:title="@string/language_selection_title" /> <PreferenceCategory android:title="@string/general_category" android:key="general_settings"> @@ -60,10 +63,6 @@ android:entryValues="@array/voice_input_modes_values" android:entries="@array/voice_input_modes" android:defaultValue="@string/voice_mode_main" /> - <PreferenceScreen - android:key="subtype_settings" - android:title="@string/language_selection_title" - android:summary="@string/language_selection_summary" /> </PreferenceCategory> <PreferenceCategory android:title="@string/correction_category" diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 6c515c845..baad66d87 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -375,10 +375,6 @@ public class Settings extends PreferenceActivity generalSettings.removePreference(findPreference(PREF_VIBRATE_ON)); } - if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED) { - generalSettings.removePreference(findPreference(PREF_SUBTYPES)); - } - final boolean showPopupOption = res.getBoolean( R.bool.config_enable_show_popup_on_keypress_option); if (!showPopupOption) { |