Reorganize language & input settings
Bug: 14860252
Bug: 16115751
Change-Id: I198aabebc08421764b78e137e7f26d2a7772d452
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d8c3171..b52f40d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3116,8 +3116,10 @@
<string name="input_methods_settings_title">Text input</string>
<!-- Setting name for Input Method chooser -->
<string name="input_method">Input method</string>
- <!-- Title for the option to press to choose the current input method [CHAR LIMIT=35] -->
- <string name="current_input_method">Default</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] -->
+ <string name="current_input_method">Current Keyboard</string>
<!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
<string name="input_method_selector">Input method selector</string>
<!-- An option to always show input method selector automatically when needed [CHAR LIMIT=25] -->
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index c210312..d8e7603 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -32,10 +32,17 @@
android:key="key_user_dictionary_settings"
android:title="@string/user_dict_settings_title" />
- <PreferenceCategory android:key="keyboard_settings_category"
+ <PreferenceCategory
+ android:key="keyboard_settings_category"
android:title="@string/keyboard_settings_category">
- <PreferenceScreen android:key="current_input_method"
+ <!-- An intent for this preference will be populated programmatically. -->
+ <PreferenceScreen
+ android:key="choose_input_methods"
+ android:title="@string/choose_input_methods" />
+ <PreferenceScreen
+ android:key="current_input_method"
android:title="@string/current_input_method" />
+ <!-- Enabled input method list will be populated programmatically here. -->
</PreferenceCategory>
<PreferenceCategory