Remove "Choose Keyboards" settings
Bug: 17109233 Change-Id: Ia3860b12238d9d2233dc270e37a055a9a411b037
This commit is contained in:
@@ -3339,8 +3339,6 @@
|
|||||||
<string name="input_methods_settings_title">Text input</string>
|
<string name="input_methods_settings_title">Text input</string>
|
||||||
<!-- Setting name for Input Method chooser -->
|
<!-- Setting name for Input Method chooser -->
|
||||||
<string name="input_method">Input method</string>
|
<string name="input_method">Input method</string>
|
||||||
<!-- Title for the option to press to enable or disable keyboards, also known as input methods [CHAR LIMIT=35] -->
|
|
||||||
<string name="choose_input_methods">Choose Keyboards</string>
|
|
||||||
<!-- Title for the option to press to choose the current keyboard, also known as input method [CHAR LIMIT=35] -->
|
<!-- Title for the option to press to choose the current keyboard, also known as input method [CHAR LIMIT=35] -->
|
||||||
<string name="current_input_method">Current Keyboard</string>
|
<string name="current_input_method">Current Keyboard</string>
|
||||||
<!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
|
<!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
|
||||||
|
@@ -46,12 +46,6 @@
|
|||||||
android:title="@string/keyboard_settings_category"
|
android:title="@string/keyboard_settings_category"
|
||||||
settings:keywords="@string/keywords_keyboard_and_ime">
|
settings:keywords="@string/keywords_keyboard_and_ime">
|
||||||
|
|
||||||
<!-- An intent for this preference will be populated programmatically. -->
|
|
||||||
<PreferenceScreen
|
|
||||||
android:key="choose_input_methods"
|
|
||||||
android:title="@string/choose_input_methods"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<PreferenceScreen
|
<PreferenceScreen
|
||||||
android:key="current_input_method"
|
android:key="current_input_method"
|
||||||
android:title="@string/current_input_method"
|
android:title="@string/current_input_method"
|
||||||
|
@@ -80,7 +80,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
|
|||||||
InputMethodPreference.OnSavePreferenceListener {
|
InputMethodPreference.OnSavePreferenceListener {
|
||||||
private static final String KEY_SPELL_CHECKERS = "spellcheckers_settings";
|
private static final String KEY_SPELL_CHECKERS = "spellcheckers_settings";
|
||||||
private static final String KEY_PHONE_LANGUAGE = "phone_language";
|
private static final String KEY_PHONE_LANGUAGE = "phone_language";
|
||||||
private static final String KEY_CHOOSE_INPUT_METHODS = "choose_input_methods";
|
|
||||||
private static final String KEY_CURRENT_INPUT_METHOD = "current_input_method";
|
private static final String KEY_CURRENT_INPUT_METHOD = "current_input_method";
|
||||||
private static final String KEY_INPUT_METHOD_SELECTOR = "input_method_selector";
|
private static final String KEY_INPUT_METHOD_SELECTOR = "input_method_selector";
|
||||||
private static final String KEY_USER_DICTIONARY_SETTINGS = "key_user_dictionary_settings";
|
private static final String KEY_USER_DICTIONARY_SETTINGS = "key_user_dictionary_settings";
|
||||||
@@ -154,14 +153,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
|
|||||||
}
|
}
|
||||||
mKeyboardSettingsCategory.removeAll();
|
mKeyboardSettingsCategory.removeAll();
|
||||||
getPreferenceScreen().addPreference(mKeyboardSettingsCategory);
|
getPreferenceScreen().addPreference(mKeyboardSettingsCategory);
|
||||||
} else {
|
|
||||||
final Preference pref = findPreference(KEY_CHOOSE_INPUT_METHODS);
|
|
||||||
final Intent intent = new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS);
|
|
||||||
intent.setClass(activity, SubSettings.class);
|
|
||||||
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, getClass().getName());
|
|
||||||
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID,
|
|
||||||
R.string.choose_input_methods);
|
|
||||||
pref.setIntent(intent);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build hard keyboard and game controller preference categories.
|
// Build hard keyboard and game controller preference categories.
|
||||||
|
Reference in New Issue
Block a user