commit 3fa13775e805df6cc7244d3f93105c5d3a5b748f
author satok <satok@google.com> Mon Jun 27 23:44:01 2011 +0900
committer satok <satok@google.com> Thu Jun 30 20:13:29 2011 +0900
tree 6949a93e745ace9be27df817cf0c528fee63c2fc
parent 29865fed4d6ede8f014dd03207d8b9bee5a27394

Implement new UI for IME settings

Bug: 4645160

Change-Id: If9046e7e96732f6ee4c0594cc66622b6462bdec9

res/xml/language_settings.xml

diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 1b5f039..fdf87fc 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -32,6 +32,35 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory android:key="keyboard_settings_category"
+            android:title="@string/keyboard_settings_category">
+        <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">
+        <CheckBoxPreference
+                android:key="auto_replace"
+                android:title="@string/auto_replace"
+                android:summaryOn="@string/auto_replace_summary"
+                android:summaryOff="@string/auto_replace_summary"
+                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: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:persistent="false"/>
+    </PreferenceCategory>
+
     <PreferenceCategory android:key="voice_input_category"
             android:title="@string/voice_input_category" >
 
@@ -54,24 +83,6 @@
                 android:title="@string/tts_settings_title" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:key="keyboard_settings_category"
-            android:title="@string/keyboard_settings_category">
-        <PreferenceScreen android:key="current_input_method"
-                android:title="@string/current_input_method" />
-
-        <ListPreference android:key="input_method_selector"
-                android:title="@string/input_method_selector"
-                android:persistent="true"
-                android:entryValues="@array/input_method_selector_values"
-                android:entries="@array/input_method_selector_titles"
-                android:defaultValue="@string/input_method_selector_visibility_default_value"/>
-
-        <PreferenceScreen android:key="configure_input_method"
-                android:title="@string/configure_input_method">
-                <intent android:action="android.settings.INPUT_METHOD_SETTINGS"/>
-        </PreferenceScreen>
-    </PreferenceCategory>
-
     <PreferenceCategory android:key="pointer_settings_category"
             android:title="@string/pointer_settings_category">
         <com.android.settings.PointerSpeedPreference