auto import from //depot/cupcake/@136594

2 files changed, 48 insertions, 22 deletions

diff --git a/res/xml/keyboard_settings.xml b/res/xml/keyboard_settings.xml
new file mode 100644
index 0000000..85d90ab
--- /dev/null
+++ b/res/xml/keyboard_settings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+
+    <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"/>
+            
+</PreferenceScreen>
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 050896f..86893bd 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -29,6 +29,15 @@
     <PreferenceCategory android:key="text_category"
             android:title="@string/text_category" />
 
+    <PreferenceScreen
+            android:key="hardkeyboard_category"
+            android:title="@string/builtin_keyboard_settings_title"
+            android:summary="@string/builtin_keyboard_settings_summary">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.PhysicalKeyboardSettings"/>
+    </PreferenceScreen>
+    
     <PreferenceScreen 
             android:title="@string/user_dict_settings_title" 
             android:summary="@string/user_dict_settings_summary">
@@ -37,26 +46,4 @@
                 android:targetClass="com.android.settings.UserDictionarySettings" />
     </PreferenceScreen>
 
-    <PreferenceCategory
-            android:key="hardkeyboard_category"
-            android:title="@string/hardkeyboard_category">
-        <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>
 </PreferenceScreen>