commit 74e7c3e3601f4808854cf12bffe11ebf4c6ea8ab
author Tadashi G. Takaoka <takaoka@google.com> Wed Jul 09 16:26:12 2014 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Thu Jul 10 18:58:06 2014 +0900
tree 1aab48ce7df7d4fd3faa49b573a89fa721702bef
parent 45ece1cf60f5c8de28122c36a168553e63c9855e

Reorganize language & input settings

Bug: 14860252
Bug: 16115751
Change-Id: I198aabebc08421764b78e137e7f26d2a7772d452

res/xml/language_settings.xml

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