commit e46c5f30caddb10c69eee62fc2f9db3f26f29bb5
author Jeff Brown <jeffbrown@google.com> Thu Apr 05 11:42:18 2012 -0700
committer Jeff Brown <jeffbrown@google.com> Thu Apr 05 14:41:41 2012 -0700
tree 6d98f04c53b22555c4a9b23f7c37e8223e000649
parent c2584bff7783b84dd9ee67f5ae7a38376fa1370f

Add new settings UI to select keyboard layout.

Bug: 6110399
Change-Id: Ib2758bdcdd6b271be402f46c56d41619dc7aecb9

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d080d59..9569dfb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2614,6 +2614,12 @@
     <!-- On Language & input settings screen, setting summary.  Setting for mouse pointer speed. [CHAR LIMIT=35] -->
     <string name="pointer_speed">Pointer speed</string>
 
+    <!-- Keyboard Layout Picker --> <skip />
+    <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
+    <string name="keyboard_layout_picker_title">Choose keyboard layout</string>
+    <!-- String to show when no keyboard layouts are available. [CHAR LIMIT=60] -->
+    <string name="keyboard_layout_picker_empty_text">No keyboard layouts are available.</string>
+
     <!-- User dictionary settings --><skip />
     <!-- User dictionary settings, The titlebar text of the User dictionary settings screen. -->
     <string name="user_dict_settings_titlebar">User dictionary</string>

res/xml/language_settings.xml

diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index fbfb3d7..cfcc341 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -36,27 +36,34 @@
         <PreferenceScreen android:key="current_input_method"
                 android:title="@string/current_input_method" />
     </PreferenceCategory>
+
     <PreferenceCategory
             android:key="hard_keyboard"
             android:title="@string/builtin_keyboard_settings_title"
             android:persistent="false">
+        <!-- Additional preference screens are inserted here programmatically
+             with low order values to set the key map of each attached keyboard. -->
+
         <CheckBoxPreference
                 android:key="auto_replace"
                 android:title="@string/auto_replace"
                 android:summaryOn="@string/auto_replace_summary"
                 android:summaryOff="@string/auto_replace_summary"
+                android:order="1000"
                 android:persistent="false"/>
         <CheckBoxPreference
                 android:key="auto_caps"
                 android:title="@string/auto_caps"
                 android:summaryOn="@string/auto_caps_summary"
                 android:summaryOff="@string/auto_caps_summary"
+                android:order="1001"
                 android:persistent="false"/>
         <CheckBoxPreference
                 android:key="auto_punctuate"
                 android:title="@string/auto_punctuate"
                 android:summaryOn="@string/auto_punctuate_summary"
                 android:summaryOff="@string/auto_punctuate_summary"
+                android:order="1002"
                 android:persistent="false"/>
     </PreferenceCategory>