From 3c8117c88fc738f841ac43f5a88602a99b901fee Mon Sep 17 00:00:00 2001 From: Satoshi Kataoka Date: Fri, 22 Mar 2013 14:53:03 +0900 Subject: [PATCH] Fix appname Bug: 6789579 Change-Id: Ic4694e36e0846af95fa8dcdef919be251983b528 --- java/AndroidManifest.xml | 6 ++-- java/res/values-af/strings-appname.xml | 27 --------------- java/res/values-am/strings-appname.xml | 27 --------------- java/res/values-ar/strings-appname.xml | 27 --------------- java/res/values-be/strings-appname.xml | 27 --------------- java/res/values-bg/strings-appname.xml | 27 --------------- java/res/values-ca/strings-appname.xml | 27 --------------- java/res/values-cs/strings-appname.xml | 27 --------------- java/res/values-da/strings-appname.xml | 27 --------------- java/res/values-de/strings-appname.xml | 27 --------------- java/res/values-el/strings-appname.xml | 27 --------------- java/res/values-en-rGB/strings-appname.xml | 27 --------------- java/res/values-es-rUS/strings-appname.xml | 27 --------------- java/res/values-es/strings-appname.xml | 27 --------------- java/res/values-et/strings-appname.xml | 27 --------------- java/res/values-fa/strings-appname.xml | 27 --------------- java/res/values-fi/strings-appname.xml | 27 --------------- java/res/values-fr/strings-appname.xml | 27 --------------- java/res/values-hi/strings-appname.xml | 27 --------------- java/res/values-hr/strings-appname.xml | 27 --------------- java/res/values-hu/strings-appname.xml | 27 --------------- java/res/values-in/strings-appname.xml | 27 --------------- java/res/values-it/strings-appname.xml | 27 --------------- java/res/values-iw/strings-appname.xml | 27 --------------- java/res/values-ja/strings-appname.xml | 27 --------------- java/res/values-ko/strings-appname.xml | 27 --------------- java/res/values-lt/strings-appname.xml | 27 --------------- java/res/values-lv/strings-appname.xml | 27 --------------- java/res/values-ms/strings-appname.xml | 27 --------------- java/res/values-nb/strings-appname.xml | 27 --------------- java/res/values-nl/strings-appname.xml | 27 --------------- java/res/values-pl/strings-appname.xml | 30 ----------------- java/res/values-pt-rPT/strings-appname.xml | 27 --------------- java/res/values-pt/strings-appname.xml | 27 --------------- java/res/values-ro/strings-appname.xml | 27 --------------- java/res/values-ru/strings-appname.xml | 27 --------------- java/res/values-sk/strings-appname.xml | 27 --------------- java/res/values-sl/strings-appname.xml | 27 --------------- java/res/values-sr/strings-appname.xml | 27 --------------- java/res/values-sv/strings-appname.xml | 27 --------------- java/res/values-sw/strings-appname.xml | 27 --------------- java/res/values-th/strings-appname.xml | 27 --------------- java/res/values-tl/strings-appname.xml | 27 --------------- java/res/values-tr/strings-appname.xml | 27 --------------- java/res/values-uk/strings-appname.xml | 27 --------------- java/res/values-vi/strings-appname.xml | 27 --------------- java/res/values-zh-rCN/strings-appname.xml | 27 --------------- java/res/values-zh-rTW/strings-appname.xml | 27 --------------- java/res/values-zu/strings-appname.xml | 27 --------------- java/res/values/strings-appname.xml | 33 ------------------- java/res/values/strings.xml | 20 +++++++---- java/res/xml/prefs.xml | 1 - java/res/xml/spell_checker_settings.xml | 3 +- .../android/inputmethod/latin/LatinIME.java | 2 +- .../inputmethod/latin/SettingsFragment.java | 5 +++ .../com/android/inputmethod/latin/Utils.java | 20 +++++++++++ .../SpellCheckerSettingsFragment.java | 7 ++++ 57 files changed, 51 insertions(+), 1345 deletions(-) delete mode 100644 java/res/values-af/strings-appname.xml delete mode 100644 java/res/values-am/strings-appname.xml delete mode 100644 java/res/values-ar/strings-appname.xml delete mode 100644 java/res/values-be/strings-appname.xml delete mode 100644 java/res/values-bg/strings-appname.xml delete mode 100644 java/res/values-ca/strings-appname.xml delete mode 100644 java/res/values-cs/strings-appname.xml delete mode 100644 java/res/values-da/strings-appname.xml delete mode 100644 java/res/values-de/strings-appname.xml delete mode 100644 java/res/values-el/strings-appname.xml delete mode 100644 java/res/values-en-rGB/strings-appname.xml delete mode 100644 java/res/values-es-rUS/strings-appname.xml delete mode 100644 java/res/values-es/strings-appname.xml delete mode 100644 java/res/values-et/strings-appname.xml delete mode 100644 java/res/values-fa/strings-appname.xml delete mode 100644 java/res/values-fi/strings-appname.xml delete mode 100644 java/res/values-fr/strings-appname.xml delete mode 100644 java/res/values-hi/strings-appname.xml delete mode 100644 java/res/values-hr/strings-appname.xml delete mode 100644 java/res/values-hu/strings-appname.xml delete mode 100644 java/res/values-in/strings-appname.xml delete mode 100644 java/res/values-it/strings-appname.xml delete mode 100644 java/res/values-iw/strings-appname.xml delete mode 100644 java/res/values-ja/strings-appname.xml delete mode 100644 java/res/values-ko/strings-appname.xml delete mode 100644 java/res/values-lt/strings-appname.xml delete mode 100644 java/res/values-lv/strings-appname.xml delete mode 100644 java/res/values-ms/strings-appname.xml delete mode 100644 java/res/values-nb/strings-appname.xml delete mode 100644 java/res/values-nl/strings-appname.xml delete mode 100644 java/res/values-pl/strings-appname.xml delete mode 100644 java/res/values-pt-rPT/strings-appname.xml delete mode 100644 java/res/values-pt/strings-appname.xml delete mode 100644 java/res/values-ro/strings-appname.xml delete mode 100644 java/res/values-ru/strings-appname.xml delete mode 100644 java/res/values-sk/strings-appname.xml delete mode 100644 java/res/values-sl/strings-appname.xml delete mode 100644 java/res/values-sr/strings-appname.xml delete mode 100644 java/res/values-sv/strings-appname.xml delete mode 100644 java/res/values-sw/strings-appname.xml delete mode 100644 java/res/values-th/strings-appname.xml delete mode 100644 java/res/values-tl/strings-appname.xml delete mode 100644 java/res/values-tr/strings-appname.xml delete mode 100644 java/res/values-uk/strings-appname.xml delete mode 100644 java/res/values-vi/strings-appname.xml delete mode 100644 java/res/values-zh-rCN/strings-appname.xml delete mode 100644 java/res/values-zh-rTW/strings-appname.xml delete mode 100644 java/res/values-zu/strings-appname.xml delete mode 100644 java/res/values/strings-appname.xml diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index 49855e313..80cd08569 100644 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -44,7 +44,7 @@ @@ -69,7 +69,7 @@ - @@ -77,7 +77,7 @@ + android:label="@string/aosp_android_spell_checker_service_settings"> diff --git a/java/res/values-af/strings-appname.xml b/java/res/values-af/strings-appname.xml deleted file mode 100644 index d6bb52f52..000000000 --- a/java/res/values-af/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android-sleutelbord" - "Android-speltoetser" - "Android-sleutelbordinstellings" - "Speltoets tans instellings" - diff --git a/java/res/values-am/strings-appname.xml b/java/res/values-am/strings-appname.xml deleted file mode 100644 index fd93114f3..000000000 --- a/java/res/values-am/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "የAndroid ቁልፍ ሰሌዳ" - "Android የፊደል አራሚ" - "Android የቁልፍ ሰሌዳ ቅንብሮች" - "የፊደል አራሚ ቅንብሮች" - diff --git a/java/res/values-ar/strings-appname.xml b/java/res/values-ar/strings-appname.xml deleted file mode 100644 index 3d81e5d4b..000000000 --- a/java/res/values-ar/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "لوحة مفاتيح Android" - "التدقيق الإملائي في Android" - "إعدادات لوحة مفاتيح Android" - "إعدادات التدقيق الإملائي" - diff --git a/java/res/values-be/strings-appname.xml b/java/res/values-be/strings-appname.xml deleted file mode 100644 index e0aadfa3c..000000000 --- a/java/res/values-be/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Клавіятура Android" - "Iнструмент праверкi правапiсу для Android" - "Налады клавіятуры Android" - "Налады праверкі арфаграфіі" - diff --git a/java/res/values-bg/strings-appname.xml b/java/res/values-bg/strings-appname.xml deleted file mode 100644 index 49e301d32..000000000 --- a/java/res/values-bg/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Клавиатура на Android" - "Програма за правописна проверка за Android" - "Настройки на клавиатурата на Android" - "Настройки за проверка на правописа" - diff --git a/java/res/values-ca/strings-appname.xml b/java/res/values-ca/strings-appname.xml deleted file mode 100644 index add5c3f2f..000000000 --- a/java/res/values-ca/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Teclat Android" - "Corrector ortogràfic d\'Android" - "Configuració del teclat d\'Android" - "Configuració de la correcció ortogràfica" - diff --git a/java/res/values-cs/strings-appname.xml b/java/res/values-cs/strings-appname.xml deleted file mode 100644 index 0eeac88b4..000000000 --- a/java/res/values-cs/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Klávesnice Android" - "Kontrola pravopisu Android" - "Nastavení klávesnice Android" - "Nastavení kontroly pravopisu" - diff --git a/java/res/values-da/strings-appname.xml b/java/res/values-da/strings-appname.xml deleted file mode 100644 index faef5824b..000000000 --- a/java/res/values-da/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android-tastatur" - "Android-stavekontrol" - "Indstillinger for Android-tastatur" - "Indstillinger for stavekontrol" - diff --git a/java/res/values-de/strings-appname.xml b/java/res/values-de/strings-appname.xml deleted file mode 100644 index fc5fb8902..000000000 --- a/java/res/values-de/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android-Tastatur" - "Android-Rechtschreibprüfung" - "Android-Tastatureinstellungen" - "Einstellungen für Rechtschreibprüfung" - diff --git a/java/res/values-el/strings-appname.xml b/java/res/values-el/strings-appname.xml deleted file mode 100644 index a199655f2..000000000 --- a/java/res/values-el/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Πληκτρολόγιο Android" - "Ορθογραφικός έλεγχος Android" - "Ρυθμίσεις πληκτρολογίου Android" - "Ρυθμίσεις ορθογραφικού ελέγχου" - diff --git a/java/res/values-en-rGB/strings-appname.xml b/java/res/values-en-rGB/strings-appname.xml deleted file mode 100644 index ad9e782b0..000000000 --- a/java/res/values-en-rGB/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android keyboard" - "Android spell checker" - "Android keyboard settings" - "Spell checking settings" - diff --git a/java/res/values-es-rUS/strings-appname.xml b/java/res/values-es-rUS/strings-appname.xml deleted file mode 100644 index 5f08afba4..000000000 --- a/java/res/values-es-rUS/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Teclado de Android" - "Corrector ortográfico de Android" - "Configuración de teclado de Android" - "Configuración del corrector ortográfico" - diff --git a/java/res/values-es/strings-appname.xml b/java/res/values-es/strings-appname.xml deleted file mode 100644 index cce9a176d..000000000 --- a/java/res/values-es/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Teclado de Android" - "Corrector ortográfico de Android" - "Ajustes del teclado de Android" - "Ajustes del corrector ortográfico" - diff --git a/java/res/values-et/strings-appname.xml b/java/res/values-et/strings-appname.xml deleted file mode 100644 index 181d597f9..000000000 --- a/java/res/values-et/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Androidi klaviatuur" - "Androidi õigekirjakontroll" - "Androidi klaviatuuri seaded" - "Õigekirjakontrolli seaded" - diff --git a/java/res/values-fa/strings-appname.xml b/java/res/values-fa/strings-appname.xml deleted file mode 100644 index ba2a76ff1..000000000 --- a/java/res/values-fa/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "صفحه‌کلید Android" - "غلط‌گیر املای Android" - "تنظیمات صفحه‌کلید Android" - "تنظیمات غلط‌‌ گیر املا" - diff --git a/java/res/values-fi/strings-appname.xml b/java/res/values-fi/strings-appname.xml deleted file mode 100644 index b2e23d552..000000000 --- a/java/res/values-fi/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android-näppäimistö" - "Android-oikoluku" - "Android-näppäimistön asetukset" - "Oikolukuasetukset" - diff --git a/java/res/values-fr/strings-appname.xml b/java/res/values-fr/strings-appname.xml deleted file mode 100644 index 8e2a6e088..000000000 --- a/java/res/values-fr/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Clavier Android" - "Correcteur orthographique Android" - "Paramètres du clavier Android" - "Paramètres du correcteur orthographique" - diff --git a/java/res/values-hi/strings-appname.xml b/java/res/values-hi/strings-appname.xml deleted file mode 100644 index 02283af9a..000000000 --- a/java/res/values-hi/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android कीबोर्ड" - "Android वर्तनी परीक्षक" - "Android कीबोर्ड सेटिंग" - "वर्तनी जांच सेटिंग" - diff --git a/java/res/values-hr/strings-appname.xml b/java/res/values-hr/strings-appname.xml deleted file mode 100644 index 69fa2e9a1..000000000 --- a/java/res/values-hr/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Androidova tipkovnica" - "Androidova provjera pravopisa" - "Postavke Androidove tipkovnice" - "Postavke provjere pravopisa" - diff --git a/java/res/values-hu/strings-appname.xml b/java/res/values-hu/strings-appname.xml deleted file mode 100644 index ad511cfbc..000000000 --- a/java/res/values-hu/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android-billentyűzet" - "Androidos helyesírás-ellenőrző" - "Android-billentyűzet beállításai" - "A helyesírás-ellenőrzés beállításai" - diff --git a/java/res/values-in/strings-appname.xml b/java/res/values-in/strings-appname.xml deleted file mode 100644 index 283d69247..000000000 --- a/java/res/values-in/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Keyboard Android" - "Pemeriksa ejaan Android" - "Setelan keyboard Android" - "Setelan pemeriksa ejaan" - diff --git a/java/res/values-it/strings-appname.xml b/java/res/values-it/strings-appname.xml deleted file mode 100644 index b84896b9d..000000000 --- a/java/res/values-it/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Tastiera Android" - "Controllo ortografico Android" - "Impostazioni tastiera Android" - "Impostazioni di controllo ortografico" - diff --git a/java/res/values-iw/strings-appname.xml b/java/res/values-iw/strings-appname.xml deleted file mode 100644 index f3f4b674c..000000000 --- a/java/res/values-iw/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "מקלדת Android" - "בודק האיות של Android" - "הגדרות מקלדת Android" - "הגדרות בדיקת איות" - diff --git a/java/res/values-ja/strings-appname.xml b/java/res/values-ja/strings-appname.xml deleted file mode 100644 index 16c1c05c6..000000000 --- a/java/res/values-ja/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Androidキーボード" - "Androidスペルチェッカー" - "Androidキーボードの設定" - "スペルチェックの設定" - diff --git a/java/res/values-ko/strings-appname.xml b/java/res/values-ko/strings-appname.xml deleted file mode 100644 index 3d7db6136..000000000 --- a/java/res/values-ko/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android 키보드" - "Android 맞춤법 검사기" - "Android 키보드 설정" - "맞춤법 검사 설정" - diff --git a/java/res/values-lt/strings-appname.xml b/java/res/values-lt/strings-appname.xml deleted file mode 100644 index 668d27531..000000000 --- a/java/res/values-lt/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "„Android“ klaviatūra" - "„Android“ rašybos tikrinimo programa" - "„Android“ klaviatūros nustatymai" - "Rašybos tikrinimo nustatymai" - diff --git a/java/res/values-lv/strings-appname.xml b/java/res/values-lv/strings-appname.xml deleted file mode 100644 index e5657a237..000000000 --- a/java/res/values-lv/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android tastatūra" - "Android pareizrakstības pārbaudītājs" - "Android tastatūras iestatījumi" - "Pareizrakstības pārbaudes iestatījumi" - diff --git a/java/res/values-ms/strings-appname.xml b/java/res/values-ms/strings-appname.xml deleted file mode 100644 index 73b553751..000000000 --- a/java/res/values-ms/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Papan kekunci Android" - "Penyemak ejaan Android" - "Tetapan papan kekunci Android" - "Tetapan penyemakan ejaan" - diff --git a/java/res/values-nb/strings-appname.xml b/java/res/values-nb/strings-appname.xml deleted file mode 100644 index 56c1c3c71..000000000 --- a/java/res/values-nb/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android-tastatur" - "Android-stavekontroll" - "Innstillinger for Android-tastatur" - "Innstillinger for stavekontroll" - diff --git a/java/res/values-nl/strings-appname.xml b/java/res/values-nl/strings-appname.xml deleted file mode 100644 index ee288efbb..000000000 --- a/java/res/values-nl/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android-toetsenbord" - "Spellingcontrole van Android" - "Instellingen voor Android-toetsenbord" - "Instellingen voor spellingcontrole" - diff --git a/java/res/values-pl/strings-appname.xml b/java/res/values-pl/strings-appname.xml deleted file mode 100644 index e460644a3..000000000 --- a/java/res/values-pl/strings-appname.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - "Klawiatura Android" - - - - - - - diff --git a/java/res/values-pt-rPT/strings-appname.xml b/java/res/values-pt-rPT/strings-appname.xml deleted file mode 100644 index 1b88acb69..000000000 --- a/java/res/values-pt-rPT/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Teclado do Android" - "Verificador ortográfico do Android" - "Definições de teclado do Android" - "Definições da verificação ortográfica" - diff --git a/java/res/values-pt/strings-appname.xml b/java/res/values-pt/strings-appname.xml deleted file mode 100644 index d78786d63..000000000 --- a/java/res/values-pt/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Teclado do Android" - "Corretor ortográfico do Android" - "Configurações de teclado do Android" - "Configurações de verificação ortográfica" - diff --git a/java/res/values-ro/strings-appname.xml b/java/res/values-ro/strings-appname.xml deleted file mode 100644 index dfa642204..000000000 --- a/java/res/values-ro/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Tastatură Android" - "Verificator ortografic Android" - "Setările tastaturii Android" - "Setările de verificare ortografică" - diff --git a/java/res/values-ru/strings-appname.xml b/java/res/values-ru/strings-appname.xml deleted file mode 100644 index 5db1d0bc9..000000000 --- a/java/res/values-ru/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Клавиатура Android" - "Проверка правописания Android" - "Настройки клавиатуры Android" - "Настройки проверки правописания" - diff --git a/java/res/values-sk/strings-appname.xml b/java/res/values-sk/strings-appname.xml deleted file mode 100644 index 5b5590000..000000000 --- a/java/res/values-sk/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Klávesnica Android" - "Kontrola pravopisu Android" - "Nastavenia klávesnice Android" - "Nastavenia kontroly pravopisu" - diff --git a/java/res/values-sl/strings-appname.xml b/java/res/values-sl/strings-appname.xml deleted file mode 100644 index fd303d8dd..000000000 --- a/java/res/values-sl/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Tipkovnica Android" - "Črkovalnik za Android" - "Nastavitve tipkovnice Android" - "Nastavitve preverjanja črkovanja" - diff --git a/java/res/values-sr/strings-appname.xml b/java/res/values-sr/strings-appname.xml deleted file mode 100644 index 449fe551a..000000000 --- a/java/res/values-sr/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android тастатура" - "Android провера правописа" - "Подешавања Android тастатуре" - "Подешавања провере правописа" - diff --git a/java/res/values-sv/strings-appname.xml b/java/res/values-sv/strings-appname.xml deleted file mode 100644 index 9b4a7dbd1..000000000 --- a/java/res/values-sv/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Androids tangentbord" - "Stavningskontroll i Android" - "Inställningar för Androids tangentbord" - "Inställningar för stavningskontroll" - diff --git a/java/res/values-sw/strings-appname.xml b/java/res/values-sw/strings-appname.xml deleted file mode 100644 index 51de0a6b8..000000000 --- a/java/res/values-sw/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Kibodi ya Android" - "Kikagua tahajia cha Android" - "Mipangilio ya kibodi ya Android" - "Mipangilio ya kukagua tahajia" - diff --git a/java/res/values-th/strings-appname.xml b/java/res/values-th/strings-appname.xml deleted file mode 100644 index 7fc7e3e43..000000000 --- a/java/res/values-th/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "แป้นพิมพ์แอนดรอยด์" - "การตรวจสอบการสะกดของแอนดรอยด์" - "การตั้งค่าแป้นพิมพ์แอนดรอยด์" - "การตั้งค่าการตรวจสอบการสะกด" - diff --git a/java/res/values-tl/strings-appname.xml b/java/res/values-tl/strings-appname.xml deleted file mode 100644 index fd2b3f55b..000000000 --- a/java/res/values-tl/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Keyboard ng Android" - "Spell checker ng Android" - "Mga setting ng keyboard ng Android" - "Mga setting ng pag-spell check" - diff --git a/java/res/values-tr/strings-appname.xml b/java/res/values-tr/strings-appname.xml deleted file mode 100644 index f5e36d2e8..000000000 --- a/java/res/values-tr/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android klavyesi" - "Android yazım denetleyici" - "Android klavye ayarları" - "Yazım denetimi ayarları" - diff --git a/java/res/values-uk/strings-appname.xml b/java/res/values-uk/strings-appname.xml deleted file mode 100644 index fdbb89fd9..000000000 --- a/java/res/values-uk/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Клавіатура Android" - "Засіб перевірки орфографії Android" - "Налаштування клавіатури Android" - "Налаштування перевірки орфографії" - diff --git a/java/res/values-vi/strings-appname.xml b/java/res/values-vi/strings-appname.xml deleted file mode 100644 index 6e32d0370..000000000 --- a/java/res/values-vi/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Bàn phím Android" - "Trình kiểm tra chính tả Android" - "Cài đặt bàn phím Android" - "Cài đặt kiểm tra chính tả" - diff --git a/java/res/values-zh-rCN/strings-appname.xml b/java/res/values-zh-rCN/strings-appname.xml deleted file mode 100644 index f5e12fd5e..000000000 --- a/java/res/values-zh-rCN/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android 键盘" - "Android 拼写检查工具" - "Android 键盘设置" - "拼写检查设置" - diff --git a/java/res/values-zh-rTW/strings-appname.xml b/java/res/values-zh-rTW/strings-appname.xml deleted file mode 100644 index 8cc663826..000000000 --- a/java/res/values-zh-rTW/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Android 鍵盤" - "Android 拼字檢查" - "Android 鍵盤設定" - "拼字檢查設定" - diff --git a/java/res/values-zu/strings-appname.xml b/java/res/values-zu/strings-appname.xml deleted file mode 100644 index a0fb51716..000000000 --- a/java/res/values-zu/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - "Ikhibhodi ye-Android" - "Isihloli sokupela se-Android" - "Izilungiselelo zekhibhodi ye-Android" - "Izilungiselelo zokuhlola ukupela" - diff --git a/java/res/values/strings-appname.xml b/java/res/values/strings-appname.xml deleted file mode 100644 index ad25ff681..000000000 --- a/java/res/values/strings-appname.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - Android Keyboard - - - Android Spell Checker - - - Android Keyboard Settings - - - Android Spell Checker Settings - diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 273525100..ebcd3d956 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -19,14 +19,22 @@ --> - Android keyboard (AOSP) - - Input options - - Research Log Commands + Android Keyboard (AOSP) + + + Android Keyboard Settings (AOSP) - Android spell checker (AOSP) + Android Spell Checker (AOSP) + + + Android Spell Checker Settings (AOSP) + + + Input options + + + Research Log Commands Look up contact names diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index e299ce4f8..783946252 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -17,7 +17,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> cls) { + final ComponentName cn = new ComponentName(context, cls); + try { + final ActivityInfo ai = context.getPackageManager().getActivityInfo(cn, 0); + if (ai != null) { + return ai.labelRes; + } + } catch (NameNotFoundException e) { + Log.e(TAG, "Failed to get settings activity title res id.", e); + } + return 0; + } } diff --git a/java/src/com/android/inputmethod/latin/spellcheck/SpellCheckerSettingsFragment.java b/java/src/com/android/inputmethod/latin/spellcheck/SpellCheckerSettingsFragment.java index 9606b0352..5ce9d8e47 100644 --- a/java/src/com/android/inputmethod/latin/spellcheck/SpellCheckerSettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/spellcheck/SpellCheckerSettingsFragment.java @@ -18,8 +18,10 @@ package com.android.inputmethod.latin.spellcheck; import android.os.Bundle; import android.preference.PreferenceFragment; +import android.preference.PreferenceScreen; import com.android.inputmethod.latin.R; +import com.android.inputmethod.latin.Utils; /** * Preference screen. @@ -35,5 +37,10 @@ public final class SpellCheckerSettingsFragment extends PreferenceFragment { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); addPreferencesFromResource(R.xml.spell_checker_settings); + final PreferenceScreen preferenceScreen = getPreferenceScreen(); + if (preferenceScreen != null) { + preferenceScreen.setTitle(Utils.getAcitivityTitleResId( + getActivity(), SpellCheckerSettingsActivity.class)); + } } }