Merge commit '47ad0cf3' into manualmerge
Conflicts:
res/xml/language_settings.xml
src/com/android/settings/LanguageSettings.java
Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4368c85..1c899df 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 590fd27..3c62952 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 65b5102..b22bde9 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -858,9 +858,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 & Tastatur"</string>
<string name="language_keyboard_settings_title" msgid="3455826933385341107">"Einstellungen für Sprache & 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>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f2c7bb7..6e1594d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1978df6..3ececc6 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -858,9 +858,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 & 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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e1641e8..9152267 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f5b2765..21d6a57 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d0acc47..7d51fb1 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 220efee..f077b64 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4a71351..e513e85 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c8939b9..af43ee3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 637552f..52f3755 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 08e6c67..8147c38 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e6b5928..d665660 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 63ebac5..2b6b3fe 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0dd9025..547b161 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index fd6d09c..76eabb1 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index de4f9e1..43cb956 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e5ca0de..8546586 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7563b18..15c81c9 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -858,9 +858,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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d288265..508f354 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1955,12 +1955,10 @@
<string name="language_settings">Language & keyboard</string>
<!-- Title of Language and keyboard settings screen -->
<string name="language_keyboard_settings_title">Language & 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. -->
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>