commit 6d5b8951b13ac49a4ee395cfee75b26bc53f602a
author Ken Wakasa <kwakasa@google.com> Thu Sep 30 11:39:09 2010 +0900
committer Ken Wakasa <kwakasa@google.com> Thu Sep 30 11:54:31 2010 +0900
tree f874a2c5998fff17fe648d729d15a646cc710b01
parent 3b6aa41cce9dafa48dfbb3e93ea856610de1f1e7
parent 47ad0cf3bc288cef23877c45b67bf7f02147d1bc

Merge commit '47ad0cf3' into manualmerge

Conflicts:
	res/xml/language_settings.xml
	src/com/android/settings/LanguageSettings.java

Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2

res/xml/language_settings.xml

diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 6c55fe8..2037fc7 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -18,14 +18,23 @@
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
         android:title="@string/language_keyboard_settings_title">
 
+    <PreferenceCategory android:key="language_settings_category"
+            android:title="@string/language_settings_category" />
+
     <PreferenceScreen
        android:fragment="com.android.settings.LocalePicker"
        android:key="phone_language"
        android:title="@string/phone_language">
     </PreferenceScreen>
 
-    <PreferenceCategory android:key="text_category"
-            android:title="@string/text_category">
+    <PreferenceScreen
+        android:fragment="com.android.settings.UserDictionarySettings"
+        android:title="@string/user_dict_settings_title"
+        android:summary="@string/user_dict_settings_summary">
+    </PreferenceScreen>
+
+    <PreferenceCategory android:key="keyboard_settings_category"
+            android:title="@string/keyboard_settings_category">
 
         <PreferenceScreen android:key="input_method"
                 android:title="@string/input_method"
@@ -39,11 +48,5 @@
         android:title="@string/builtin_keyboard_settings_title"
         android:summary="@string/builtin_keyboard_settings_summary">
     </PreferenceScreen>
-    
-    <PreferenceScreen 
-        android:fragment="com.android.settings.UserDictionarySettings"
-        android:title="@string/user_dict_settings_title" 
-        android:summary="@string/user_dict_settings_summary">
-    </PreferenceScreen>
 
 </PreferenceScreen>