Revise the Language & keyboard settings layout.

bug: 2954950 Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
2010-09-28 19:01:17 +09:00
parent 48ad5dfe31
commit d2c3f37fa4
23 changed files with 25 additions and 81 deletions
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Poskytovatel <xliff:g id="COMP_NAME">%1$s</xliff:g> se používá."</string>
    <string name="language_settings" msgid="502219872342167227">"Jazyk a klávesnice"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Nastavení jazyka a klávesnice"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Nastavení jazyka a oblasti, způsobu zadávání textu a automatických oprav"</string>
-    <string name="language_category" msgid="3391756582724541530">"Nastavení národního prostředí"</string>
-    <string name="text_category" msgid="6342540511465136739">"Nastavení textu"</string>
    <string name="phone_language" msgid="1165758957501090679">"Vyberte jazyk"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Automatické nahrazování"</string>
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Udbyderen <xliff:g id="COMP_NAME">%1$s</xliff:g> er i brug."</string>
    <string name="language_settings" msgid="502219872342167227">"Sprog og tastatur"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Indstillinger for sprog og tastatur"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Angiv landestandard (sprog og område), tekstinput…"</string>
-    <string name="language_category" msgid="3391756582724541530">"Indstilling af landestandard"</string>
-    <string name="text_category" msgid="6342540511465136739">"Indstillinger for tekst"</string>
    <string name="phone_language" msgid="1165758957501090679">"Vælg sprog"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Automatisk erstatning"</string>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Anbieter <xliff:g id="COMP_NAME">%1$s</xliff:g> wird verwendet."</string>
    <string name="language_settings" msgid="502219872342167227">"Sprache &amp; Tastatur"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Einstellungen für Sprache &amp; Tastatur"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Optionen für Sprache und Region, Texteingabe und Autokorrektur festlegen"</string>
-    <string name="language_category" msgid="3391756582724541530">"Ländereinstellung"</string>
-    <string name="text_category" msgid="6342540511465136739">"Texteinstellungen"</string>
    <string name="phone_language" msgid="1165758957501090679">"Sprache auswählen"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Autom. Ersetzung"</string>
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Ο πάροχος <xliff:g id="COMP_NAME">%1$s</xliff:g> χρησιμοποιείται."</string>
    <string name="language_settings" msgid="502219872342167227">"Γλώσσα και πληκτρολόγιο"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Ρυθμίσεις γλώσσας και πληκτρολογίου"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Ορισμ.τοπ.ρυθμ.(γλώσσα και περιοχή), είσ.κειμ.και επιλ.αυτόμ.διόρθ."</string>
-    <string name="language_category" msgid="3391756582724541530">"Τοπικές ρυθμίσεις"</string>
-    <string name="text_category" msgid="6342540511465136739">"Ρυθμίσεις κειμένου"</string>
    <string name="phone_language" msgid="1165758957501090679">"Επιλογή γλώσσας"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Αυτόματη αντικατάσταση"</string>
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"El proveedor <xliff:g id="COMP_NAME">%1$s</xliff:g> está en uso."</string>
    <string name="language_settings" msgid="502219872342167227">"Idioma &amp; del teclado"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Idioma y Configuración del teclado"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Establecer opciones de país (idioma y región), ingreso de texto y corrección automática"</string>
-    <string name="language_category" msgid="3391756582724541530">"Configuración de país"</string>
-    <string name="text_category" msgid="6342540511465136739">"Configuración de texto"</string>
    <string name="phone_language" msgid="1165758957501090679">"Seleccionar idioma"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Reemplazar automát."</string>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Proveedor <xliff:g id="COMP_NAME">%1$s</xliff:g> en uso"</string>
    <string name="language_settings" msgid="502219872342167227">"Idioma y teclado"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Ajustes de teclado y de idioma"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Configuración regional, opciones de autocorrección e introducción de texto"</string>
-    <string name="language_category" msgid="3391756582724541530">"Configuración regional"</string>
-    <string name="text_category" msgid="6342540511465136739">"Ajustes de texto"</string>
    <string name="phone_language" msgid="1165758957501090679">"Seleccionar idioma"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Corrección automática"</string>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"L\'opérateur <xliff:g id="COMP_NAME">%1$s</xliff:g> est actuellement utilisé."</string>
    <string name="language_settings" msgid="502219872342167227">"Langue et clavier"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Paramètres de langue et clavier"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Définir la langue et la région, la saisie de texte et la correction automatique"</string>
-    <string name="language_category" msgid="3391756582724541530">"Paramètres régionaux"</string>
-    <string name="text_category" msgid="6342540511465136739">"Paramètres du texte"</string>
    <string name="phone_language" msgid="1165758957501090679">"Sélectionner la langue"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Remplacement auto"</string>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Il provider <xliff:g id="COMP_NAME">%1$s</xliff:g> è in uso."</string>
    <string name="language_settings" msgid="502219872342167227">"Lingua e tastiera"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Impostazioni lingua e tastiera"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Impostazioni internazionali (lingua e regione), di inserimento e correzione automatica del testo"</string>
-    <string name="language_category" msgid="3391756582724541530">"Impostazioni lingua"</string>
-    <string name="text_category" msgid="6342540511465136739">"Impostazioni testo"</string>
    <string name="phone_language" msgid="1165758957501090679">"Seleziona lingua"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Sostituzione automatica"</string>
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"プロバイダ<xliff:g id="COMP_NAME">%1$s</xliff:g>は使用中です。"</string>
    <string name="language_settings" msgid="502219872342167227">"言語とキーボード"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"言語とキーボードの設定"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"言語と地域、文字入力の設定"</string>
-    <string name="language_category" msgid="3391756582724541530">"地域/言語設定"</string>
-    <string name="text_category" msgid="6342540511465136739">"文字入力設定"</string>
    <string name="phone_language" msgid="1165758957501090679">"言語を選択"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"自動修正"</string>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"제공업체(<xliff:g id="COMP_NAME">%1$s</xliff:g>)를 사용 중입니다."</string>
    <string name="language_settings" msgid="502219872342167227">"언어 및 키보드"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"언어 및 키보드 설정"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"로케일(언어 및 지역), 텍스트 입력 및 자동 수정 옵션 설정"</string>
-    <string name="language_category" msgid="3391756582724541530">"로케일 설정"</string>
-    <string name="text_category" msgid="6342540511465136739">"텍스트 설정"</string>
    <string name="phone_language" msgid="1165758957501090679">"언어 선택"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"자동 바꾸기"</string>
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Leverandøren <xliff:g id="COMP_NAME">%1$s</xliff:g> er i bruk."</string>
    <string name="language_settings" msgid="502219872342167227">"Språk og tastatur"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Språk og tastatur"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Innstillinger for språk, region, skriving av tekst og feilretting"</string>
-    <string name="language_category" msgid="3391756582724541530">"Innstillinger for språk"</string>
-    <string name="text_category" msgid="6342540511465136739">"Tekstinnstillinger"</string>
    <string name="phone_language" msgid="1165758957501090679">"Velg språk"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Automatisk erstatting"</string>
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Provider <xliff:g id="COMP_NAME">%1$s</xliff:g> in gebruik."</string>
    <string name="language_settings" msgid="502219872342167227">"Taal en toetsenbord"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Taal- en toetsenbordinstellingen"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Instellingen voor taal en regio, tekstinvoer en autocorrectieopties opgeven"</string>
-    <string name="language_category" msgid="3391756582724541530">"Landinstelling"</string>
-    <string name="text_category" msgid="6342540511465136739">"Tekstinstellingen"</string>
    <string name="phone_language" msgid="1165758957501090679">"Taal selecteren"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Automatisch vervangen"</string>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Dostawca <xliff:g id="COMP_NAME">%1$s</xliff:g> jest w użyciu."</string>
    <string name="language_settings" msgid="502219872342167227">"Język i klawiatura"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Ustawienia języka i klawiatury"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Określ ustawienia regionalne (język i region) oraz opcje wprowadzania tekstu i autokorekty"</string>
-    <string name="language_category" msgid="3391756582724541530">"Ustawienia regionalne"</string>
-    <string name="text_category" msgid="6342540511465136739">"Ustawienia tekstu"</string>
    <string name="phone_language" msgid="1165758957501090679">"Wybierz język"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Autokorekta"</string>
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"O fornecedor <xliff:g id="COMP_NAME">%1$s</xliff:g> está a ser utilizado."</string>
    <string name="language_settings" msgid="502219872342167227">"Idioma e teclado"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Definições de idioma e teclado"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Definir opções de região (idioma e região), entrada de texto e correcção automática"</string>
-    <string name="language_category" msgid="3391756582724541530">"Definição de região"</string>
-    <string name="text_category" msgid="6342540511465136739">"Definições de texto"</string>
    <string name="phone_language" msgid="1165758957501090679">"Seleccionar idioma"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Substituir automaticamente"</string>
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"O provedor <xliff:g id="COMP_NAME">%1$s</xliff:g> está em uso."</string>
    <string name="language_settings" msgid="502219872342167227">"Idioma e teclado"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Configurações de idioma e teclado"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Definir opções de idioma e região, entrada de texto e correção automática"</string>
-    <string name="language_category" msgid="3391756582724541530">"Configuração de local"</string>
-    <string name="text_category" msgid="6342540511465136739">"Configurações de texto"</string>
    <string name="phone_language" msgid="1165758957501090679">"Selecionar idioma"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Substituição automática"</string>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Провайдер <xliff:g id="COMP_NAME">%1$s</xliff:g> используется."</string>
    <string name="language_settings" msgid="502219872342167227">"Язык и клавиатура"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Настройки языка и клавиатуры"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Выбор языка и региона, способов ввода и настройка автокоррекции"</string>
-    <string name="language_category" msgid="3391756582724541530">"Региональные настройки"</string>
-    <string name="text_category" msgid="6342540511465136739">"Настройки ввода текста"</string>
    <string name="phone_language" msgid="1165758957501090679">"Выбрать язык"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Автокоррекция"</string>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Leverantören <xliff:g id="COMP_NAME">%1$s</xliff:g> används."</string>
    <string name="language_settings" msgid="502219872342167227">"Språk och tangentbord"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Inställningar för språk och tangentbord"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Ställ in alternativ för språkkod (land och område), textinmatning och autokorrigering"</string>
-    <string name="language_category" msgid="3391756582724541530">"Språkkodsinställningar"</string>
-    <string name="text_category" msgid="6342540511465136739">"Textinställningar"</string>
    <string name="phone_language" msgid="1165758957501090679">"Välj språk"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Ersätt automatiskt"</string>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Sağlayıcı <xliff:g id="COMP_NAME">%1$s</xliff:g> kullanımda."</string>
    <string name="language_settings" msgid="502219872342167227">"Dil ve klavye"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"Dil ve klavye ayarları"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"Yer (dil ve bölge), metin girişi ve ot. düzeltme seçeneklerini ayarla"</string>
-    <string name="language_category" msgid="3391756582724541530">"Yerel ayar"</string>
-    <string name="text_category" msgid="6342540511465136739">"Metin ayarları"</string>
    <string name="phone_language" msgid="1165758957501090679">"Dil seçin"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"Otomatik değiştir"</string>
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"正在使用提供商<xliff:g id="COMP_NAME">%1$s</xliff:g>。"</string>
    <string name="language_settings" msgid="502219872342167227">"语言和键盘"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"语言和键盘设置"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"设置语言区域（语言和区域）、文字输入和自动更正选项"</string>
-    <string name="language_category" msgid="3391756582724541530">"语言区域设置"</string>
-    <string name="text_category" msgid="6342540511465136739">"文字设置"</string>
    <string name="phone_language" msgid="1165758957501090679">"选择语言"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"自动替换"</string>
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -775,9 +775,6 @@
    <string name="process_provider_in_use_description" msgid="5586603325677678940">"供應商 <xliff:g id="COMP_NAME">%1$s</xliff:g> 正在使用中。"</string>
    <string name="language_settings" msgid="502219872342167227">"語言與鍵盤"</string>
    <string name="language_keyboard_settings_title" msgid="3455826933385341107">"語言與鍵盤設定"</string>
-    <string name="language_settings_summary" msgid="595647729475399987">"選取地區設定 (語言和地區)、文字輸入和自動校正選項"</string>
-    <string name="language_category" msgid="3391756582724541530">"地區設定"</string>
-    <string name="text_category" msgid="6342540511465136739">"文字設定"</string>
    <string name="phone_language" msgid="1165758957501090679">"選取語言"</string>
    <string name="phone_language_summary" msgid="3871309445655554211"></string>
    <string name="auto_replace" msgid="6199184757891937822">"自動替換"</string>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1828,12 +1828,10 @@ found in the list of installed applications.</string>
    <string name="language_settings">Language &amp; keyboard</string>
    <!-- Title of Language and keyboard settings screen -->
    <string name="language_keyboard_settings_title">Language &amp; keyboard settings</string>
-    <!-- Summary of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
-    <string name="language_settings_summary">Set locale (language and region), text input and auto-correction options</string>
-    <!-- On Text & language settings screen, heading. Inside the "Locale & text" screen, this is the header for settings that are for locale changes. -->
-    <string name="language_category">Locale setting</string>
-    <!-- On Text & language settings screen, heading. Inside the "Locale & text" screen, this is the header for settings that relate to text (autotext, autoreplace, autocapitalization). -->
-    <string name="text_category">Text settings</string>
+    <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
+    <string name="language_settings_category">Language settings</string>
+    <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->
+    <string name="keyboard_settings_category">Keyboard settings</string>
    <!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->
    <string name="phone_language">Select language</string>
    <!-- On Text & language settings screen, setting option name. summary of the setting to take the user to a screen to select the locale. -->
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -17,6 +17,9 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">

+    <PreferenceCategory android:key="language_settings_category"
+            android:title="@string/language_settings_category" />
+
    <PreferenceScreen
            android:key="phone_language"
            android:title="@string/phone_language">
@@ -25,18 +28,6 @@
                android:targetClass="com.android.settings.LocalePicker"/>
    </PreferenceScreen>

-    <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">
@@ -45,4 +36,16 @@
                android:targetClass="com.android.settings.UserDictionarySettings" />
    </PreferenceScreen>

+    <PreferenceCategory android:key="keyboard_settings_category"
+            android:title="@string/keyboard_settings_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>
--- a/src/com/android/settings/LanguageSettings.java
+++ b/src/com/android/settings/LanguageSettings.java
@@ -44,6 +44,8 @@ import java.util.List;
 public class LanguageSettings extends PreferenceActivity {
    
    private static final String KEY_PHONE_LANGUAGE = "phone_language";
+    private static final String KEY_KEYBOARD_SETTINGS_CATEGORY = "keyboard_settings_category";
+    private static final String KEY_HARDKEYBOARD_CATEGORY = "hardkeyboard_category";
    private boolean mHaveHardKeyboard;

    private List<InputMethodInfo> mInputMethodProperties;
@@ -68,7 +70,7 @@ public class LanguageSettings extends PreferenceActivity {

        if (getAssets().getLocales().length == 1) {
            getPreferenceScreen().
-                removePreference(findPreference("language_category"));
+                removePreference(findPreference(KEY_PHONE_LANGUAGE));
        } else {
            mLanguagePref = findPreference(KEY_PHONE_LANGUAGE);
        }
@@ -76,7 +78,7 @@ public class LanguageSettings extends PreferenceActivity {
        Configuration config = getResources().getConfiguration();
        if (config.keyboard != Configuration.KEYBOARD_QWERTY) {
            getPreferenceScreen().removePreference(
-                    getPreferenceScreen().findPreference("hardkeyboard_category"));
+                    getPreferenceScreen().findPreference(KEY_HARDKEYBOARD_CATEGORY));
        } else {
            mHaveHardKeyboard = true;
        }
@@ -97,7 +99,8 @@ public class LanguageSettings extends PreferenceActivity {
        mLastInputMethodId = Settings.Secure.getString(getContentResolver(),
            Settings.Secure.DEFAULT_INPUT_METHOD);
        
-        PreferenceGroup textCategory = (PreferenceGroup) findPreference("text_category");
+        PreferenceGroup keyboardSettingsCategory = (PreferenceGroup) findPreference(
+                KEY_KEYBOARD_SETTINGS_CATEGORY);
        
        int N = (mInputMethodProperties == null ? 0 : mInputMethodProperties
                .size());
@@ -113,7 +116,7 @@ public class LanguageSettings extends PreferenceActivity {
                CheckBoxPreference chkbxPref = new CheckBoxPreference(this);
                chkbxPref.setKey(prefKey);
                chkbxPref.setTitle(label);
-                textCategory.addPreference(chkbxPref);
+                keyboardSettingsCategory.addPreference(chkbxPref);
                mCheckboxes.add(chkbxPref);
            }

@@ -133,7 +136,7 @@ public class LanguageSettings extends PreferenceActivity {
                            R.string.input_methods_settings_label_format, label);
                    prefScreen.setSummary(settingsLabel);
                }
-                textCategory.addPreference(prefScreen);
+                keyboardSettingsCategory.addPreference(prefScreen);
            }
        }
    }