From d2c3f37fa445130c8cce0f16347d61f66b4b0025 Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Tue, 28 Sep 2010 19:01:17 +0900 Subject: [PATCH] Revise the Language & keyboard settings layout. bug: 2954950 Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017 --- res/values-cs/strings.xml | 3 --- res/values-da/strings.xml | 3 --- res/values-de/strings.xml | 3 --- res/values-el/strings.xml | 3 --- res/values-es-rUS/strings.xml | 3 --- res/values-es/strings.xml | 3 --- res/values-fr/strings.xml | 3 --- res/values-it/strings.xml | 3 --- res/values-ja/strings.xml | 3 --- res/values-ko/strings.xml | 3 --- res/values-nb/strings.xml | 3 --- res/values-nl/strings.xml | 3 --- res/values-pl/strings.xml | 3 --- res/values-pt-rPT/strings.xml | 3 --- res/values-pt/strings.xml | 3 --- res/values-ru/strings.xml | 3 --- res/values-sv/strings.xml | 3 --- res/values-tr/strings.xml | 3 --- res/values-zh-rCN/strings.xml | 3 --- res/values-zh-rTW/strings.xml | 3 --- res/values/strings.xml | 10 ++++---- res/xml/language_settings.xml | 23 +++++++++++-------- .../android/settings/LanguageSettings.java | 13 +++++++---- 23 files changed, 25 insertions(+), 81 deletions(-) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index e1ddeef6c02..c7240683452 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -775,9 +775,6 @@ "Poskytovatel %1$s se používá." "Jazyk a klávesnice" "Nastavení jazyka a klávesnice" - "Nastavení jazyka a oblasti, způsobu zadávání textu a automatických oprav" - "Nastavení národního prostředí" - "Nastavení textu" "Vyberte jazyk" "Automatické nahrazování" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 119733e317e..6c237b8043a 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -775,9 +775,6 @@ "Udbyderen %1$s er i brug." "Sprog og tastatur" "Indstillinger for sprog og tastatur" - "Angiv landestandard (sprog og område), tekstinput…" - "Indstilling af landestandard" - "Indstillinger for tekst" "Vælg sprog" "Automatisk erstatning" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index d38990b10fe..ba99f2cba12 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -775,9 +775,6 @@ "Anbieter %1$s wird verwendet." "Sprache & Tastatur" "Einstellungen für Sprache & Tastatur" - "Optionen für Sprache und Region, Texteingabe und Autokorrektur festlegen" - "Ländereinstellung" - "Texteinstellungen" "Sprache auswählen" "Autom. Ersetzung" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 379bbe9c5cf..c60d699ed1f 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -775,9 +775,6 @@ "Ο πάροχος %1$s χρησιμοποιείται." "Γλώσσα και πληκτρολόγιο" "Ρυθμίσεις γλώσσας και πληκτρολογίου" - "Ορισμ.τοπ.ρυθμ.(γλώσσα και περιοχή), είσ.κειμ.και επιλ.αυτόμ.διόρθ." - "Τοπικές ρυθμίσεις" - "Ρυθμίσεις κειμένου" "Επιλογή γλώσσας" "Αυτόματη αντικατάσταση" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index b6a0f758584..520b4ef63f5 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -775,9 +775,6 @@ "El proveedor %1$s está en uso." "Idioma & del teclado" "Idioma y Configuración del teclado" - "Establecer opciones de país (idioma y región), ingreso de texto y corrección automática" - "Configuración de país" - "Configuración de texto" "Seleccionar idioma" "Reemplazar automát." diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 6a4e464055a..d8937879e75 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -775,9 +775,6 @@ "Proveedor %1$s en uso" "Idioma y teclado" "Ajustes de teclado y de idioma" - "Configuración regional, opciones de autocorrección e introducción de texto" - "Configuración regional" - "Ajustes de texto" "Seleccionar idioma" "Corrección automática" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 2943e2465f3..57eb44ca9ec 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -775,9 +775,6 @@ "L\'opérateur %1$s est actuellement utilisé." "Langue et clavier" "Paramètres de langue et clavier" - "Définir la langue et la région, la saisie de texte et la correction automatique" - "Paramètres régionaux" - "Paramètres du texte" "Sélectionner la langue" "Remplacement auto" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index acaebf71893..6465e6ab58b 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -775,9 +775,6 @@ "Il provider %1$s è in uso." "Lingua e tastiera" "Impostazioni lingua e tastiera" - "Impostazioni internazionali (lingua e regione), di inserimento e correzione automatica del testo" - "Impostazioni lingua" - "Impostazioni testo" "Seleziona lingua" "Sostituzione automatica" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 9fbabb544ff..d17a139bbd0 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -775,9 +775,6 @@ "プロバイダ%1$sは使用中です。" "言語とキーボード" "言語とキーボードの設定" - "言語と地域、文字入力の設定" - "地域/言語設定" - "文字入力設定" "言語を選択" "自動修正" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 65a04dccd84..eb499db872e 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -775,9 +775,6 @@ "제공업체(%1$s)를 사용 중입니다." "언어 및 키보드" "언어 및 키보드 설정" - "로케일(언어 및 지역), 텍스트 입력 및 자동 수정 옵션 설정" - "로케일 설정" - "텍스트 설정" "언어 선택" "자동 바꾸기" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index fc63ed1e5da..946b8a19309 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -775,9 +775,6 @@ "Leverandøren %1$s er i bruk." "Språk og tastatur" "Språk og tastatur" - "Innstillinger for språk, region, skriving av tekst og feilretting" - "Innstillinger for språk" - "Tekstinnstillinger" "Velg språk" "Automatisk erstatting" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 31e1b6975c5..c725a259abd 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -775,9 +775,6 @@ "Provider %1$s in gebruik." "Taal en toetsenbord" "Taal- en toetsenbordinstellingen" - "Instellingen voor taal en regio, tekstinvoer en autocorrectieopties opgeven" - "Landinstelling" - "Tekstinstellingen" "Taal selecteren" "Automatisch vervangen" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 46f5cdc1aca..3554ca4eb72 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -775,9 +775,6 @@ "Dostawca %1$s jest w użyciu." "Język i klawiatura" "Ustawienia języka i klawiatury" - "Określ ustawienia regionalne (język i region) oraz opcje wprowadzania tekstu i autokorekty" - "Ustawienia regionalne" - "Ustawienia tekstu" "Wybierz język" "Autokorekta" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 88aaf3c91d0..7f3319a2cd3 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -775,9 +775,6 @@ "O fornecedor %1$s está a ser utilizado." "Idioma e teclado" "Definições de idioma e teclado" - "Definir opções de região (idioma e região), entrada de texto e correcção automática" - "Definição de região" - "Definições de texto" "Seleccionar idioma" "Substituir automaticamente" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 74dadcc0cd0..a65166ca06c 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -775,9 +775,6 @@ "O provedor %1$s está em uso." "Idioma e teclado" "Configurações de idioma e teclado" - "Definir opções de idioma e região, entrada de texto e correção automática" - "Configuração de local" - "Configurações de texto" "Selecionar idioma" "Substituição automática" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 3c7f6e29dc3..c391a69bd7f 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -775,9 +775,6 @@ "Провайдер %1$s используется." "Язык и клавиатура" "Настройки языка и клавиатуры" - "Выбор языка и региона, способов ввода и настройка автокоррекции" - "Региональные настройки" - "Настройки ввода текста" "Выбрать язык" "Автокоррекция" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index e27e9ff7620..355458f92f4 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -775,9 +775,6 @@ "Leverantören %1$s används." "Språk och tangentbord" "Inställningar för språk och tangentbord" - "Ställ in alternativ för språkkod (land och område), textinmatning och autokorrigering" - "Språkkodsinställningar" - "Textinställningar" "Välj språk" "Ersätt automatiskt" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index f39a7ba3b7b..b6e98eb52d1 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -775,9 +775,6 @@ "Sağlayıcı %1$s kullanımda." "Dil ve klavye" "Dil ve klavye ayarları" - "Yer (dil ve bölge), metin girişi ve ot. düzeltme seçeneklerini ayarla" - "Yerel ayar" - "Metin ayarları" "Dil seçin" "Otomatik değiştir" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 93198a18884..bd80746c87e 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -775,9 +775,6 @@ "正在使用提供商%1$s。" "语言和键盘" "语言和键盘设置" - "设置语言区域（语言和区域）、文字输入和自动更正选项" - "语言区域设置" - "文字设置" "选择语言" "自动替换" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 159da1ef080..df3555a2930 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -775,9 +775,6 @@ "供應商 %1$s 正在使用中。" "語言與鍵盤" "語言與鍵盤設定" - "選取地區設定 (語言和地區)、文字輸入和自動校正選項" - "地區設定" - "文字設定" "選取語言" "自動替換" diff --git a/res/values/strings.xml b/res/values/strings.xml index 2d402395e80..c99db6b1e8e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1828,12 +1828,10 @@ found in the list of installed applications. Language & keyboard Language & keyboard settings - - Set locale (language and region), text input and auto-correction options - - Locale setting - - Text settings + + Language settings + + Keyboard settings Select language diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml index d3c0e02d134..278100ed293 100644 --- a/res/xml/language_settings.xml +++ b/res/xml/language_settings.xml @@ -17,6 +17,9 @@ + + @@ -25,8 +28,16 @@ android:targetClass="com.android.settings.LocalePicker"/> - + + + + + - - - - diff --git a/src/com/android/settings/LanguageSettings.java b/src/com/android/settings/LanguageSettings.java index 91d260cd092..8ab8a0c47b3 100644 --- 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 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); } } }