diff options
Diffstat (limited to 'java')
52 files changed, 334 insertions, 1130 deletions
diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml index 4107d0f88..df5b87ac1 100644 --- a/java/res/values-ar/strings.xml +++ b/java/res/values-ar/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"المزيد"</string> <string name="label_pause_key" msgid="181098308428035340">"توقف مؤقت"</string> <string name="label_wait_key" msgid="6402152600878093134">"انتظار"</string> - <string name="description_delete_key" msgid="5586406298531883960">"حذف"</string> - <string name="description_return_key" msgid="8750044000806461678">"رجوع"</string> - <string name="description_settings_key" msgid="7484527796782969219">"الإعدادات"</string> - <string name="description_shift_key" msgid="346906866277787836">"العالي"</string> - <string name="description_space_key" msgid="8512130111575878517">"مسافة"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"الرموز"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"الإدخال الصوتي"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"تشغيل الرموز"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"إيقاف الرموز"</string> - <string name="description_shift_on" msgid="6983188949895971587">"تشغيل العالي"</string> - <string name="description_shift_off" msgid="8553265474523069034">"إيقاف العالي"</string> <string name="voice_warning_title" msgid="4419354150908395008">"الإدخال الصوتي"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"الإدخال الصوتي غير معتمد حاليًا للغتك، ولكنه يعمل باللغة الإنجليزية."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"يستخدم الإدخال الصوتي خاصية التعرف على الكلام من Google. تنطبق "<a href="http://m.google.com/privacy">"سياسة خصوصية الجوال"</a>"."</string> diff --git a/java/res/values-bg/strings.xml b/java/res/values-bg/strings.xml index aab33df78..7f59a13db 100644 --- a/java/res/values-bg/strings.xml +++ b/java/res/values-bg/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Още"</string> <string name="label_pause_key" msgid="181098308428035340">"Пауза"</string> <string name="label_wait_key" msgid="6402152600878093134">"Чака"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Изтриване"</string> - <string name="description_return_key" msgid="8750044000806461678">"Return"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Настройки"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Интервал"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Символи"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Гласово въвеждане"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Символите са включени"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Символите са изключени"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift е включен"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift е изключен"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Гласово въвеждане"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"За вашия език понастоящем не се поддържа гласово въвеждане, но можете да го използвате на английски."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Гласовото въвеждане използва функцията на Google за разпознаване на говор. В сила е "<a href="http://m.google.com/privacy">"Декларацията за поверителност за мобилни устройства"</a>"."</string> diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml index 85ac44588..36939fef7 100644 --- a/java/res/values-ca/strings.xml +++ b/java/res/values-ca/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Més"</string> <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> <string name="label_wait_key" msgid="6402152600878093134">"Espera"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Suprimeix"</string> - <string name="description_return_key" msgid="8750044000806461678">"Retorn"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Configuració"</string> - <string name="description_shift_key" msgid="346906866277787836">"Majúscules"</string> - <string name="description_space_key" msgid="8512130111575878517">"Espai"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Símbols"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tabulador"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Entrada de veu"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Símbols activats"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Símbols desactivats"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Majúscules activades"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Majúscules desactivades"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Entrada de veu"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Actualment, l\'entrada de veu no és compatible amb el vostre idioma, però funciona en anglès."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"L\'entrada de veu utilitza el reconeixement de veu de Google. S\'hi aplica la "<a href="http://m.google.com/privacy">"Política de privadesa de Google Mobile"</a>"."</string> diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml index b35520ae5..132bc1c29 100644 --- a/java/res/values-cs/strings.xml +++ b/java/res/values-cs/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Další"</string> <string name="label_pause_key" msgid="181098308428035340">"Pauza"</string> <string name="label_wait_key" msgid="6402152600878093134">"Čekat"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Smazat"</string> - <string name="description_return_key" msgid="8750044000806461678">"Enter"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Nastavení"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"mezera"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Symboly"</string> - <string name="description_tab_key" msgid="828186583738307137">"Karta"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Hlasový vstup"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Symboly jsou zapnuty"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Symboly jsou vypnuty"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Režim Shift je zapnutý"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Režim Shift je vypnutý"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Hlasový vstup"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Pro váš jazyk aktuálně není hlasový vstup podporován, ale funguje v angličtině."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Hlasový vstup používá rozpoznávání hlasu Google a vztahují se na něj "<a href="http://m.google.com/privacy">"Zásady ochrany osobních údajů pro mobilní služby"</a>"."</string> diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml index 9c7dedf7f..ad92b24d1 100644 --- a/java/res/values-da/strings.xml +++ b/java/res/values-da/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Mere"</string> <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> <string name="label_wait_key" msgid="6402152600878093134">"Vent"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Slet"</string> - <string name="description_return_key" msgid="8750044000806461678">"Tilbage"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Indstillinger"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Mellemrum"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Symboler"</string> - <string name="description_tab_key" msgid="828186583738307137">"Fane"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Stemmeinput"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Symboler: Til"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Symboler: Fra"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift: Til"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift: Fra"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Stemmeinput"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Stemmeinput understøttes i øjeblikket ikke for dit sprog, men fungerer på engelsk."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Stemmeinput anvender Googles stemmegenkendelse. "<a href="http://m.google.com/privacy">"Fortrolighedspolitikken for mobilenheder"</a>" gælder."</string> diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml index a8b671757..65f0faa32 100644 --- a/java/res/values-de/strings.xml +++ b/java/res/values-de/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Mehr"</string> <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> <string name="label_wait_key" msgid="6402152600878093134">"Warten"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Löschen"</string> - <string name="description_return_key" msgid="8750044000806461678">"Eingabe"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Einstellungen"</string> - <string name="description_shift_key" msgid="346906866277787836">"Umschalt"</string> - <string name="description_space_key" msgid="8512130111575878517">"Leerzeichen"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Symbole"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Spracheingabe"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Symbole an"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Symbole aus"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Umschalt an"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Umschalt aus"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Spracheingabe"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Spracheingaben werden derzeit nicht für Ihre Sprache unterstützt, funktionieren jedoch in Englisch."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Die Spracheingabe verwendet die Spracherkennung von Google. Es gelten die "<a href="http://m.google.com/privacy">"Google Mobile-Datenschutzbestimmungen"</a>"."</string> diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml index a23959d1c..5cee959a0 100644 --- a/java/res/values-el/strings.xml +++ b/java/res/values-el/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Περισσότερα"</string> <string name="label_pause_key" msgid="181098308428035340">"Παύση"</string> <string name="label_wait_key" msgid="6402152600878093134">"Αναμ."</string> - <string name="description_delete_key" msgid="5586406298531883960">"Delete"</string> - <string name="description_return_key" msgid="8750044000806461678">"Return"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Ρυθμίσεις"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Κενό"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Σύμβολα"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Φωνητική εντολή"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Σύμβολα ενεργά"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Σύμβολα ανενεργά"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift ενεργό"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift ανενεργό"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Φωνητική είσοδος"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Η φωνητική είσοδος δεν υποστηρίζεται αυτή τη στιγμή για τη γλώσσα σας, ωστόσο λειτουργεί στα Αγγλικά."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Οι φωνητικές εντολές χρησιμοποιούν την τεχνολογία αναγνώρισης φωνής της Google. Ισχύει "<a href="http://m.google.com/privacy">"η Πολιτική Απορρήτου για κινητά"</a>"."</string> diff --git a/java/res/values-en-rGB/strings.xml b/java/res/values-en-rGB/strings.xml index 57d4ec4f8..7d5d50177 100644 --- a/java/res/values-en-rGB/strings.xml +++ b/java/res/values-en-rGB/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"More"</string> <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> <string name="label_wait_key" msgid="6402152600878093134">"Wait"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Delete"</string> - <string name="description_return_key" msgid="8750044000806461678">"Return"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Settings"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Space"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Symbols"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Voice Input"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Symbols on"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Symbols off"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift on"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift off"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Voice input"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Voice input is not currently supported for your language, but does work in English."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Voice input uses Google\'s speech recognition. "<a href="http://m.google.com/privacy">"The Mobile Privacy Policy"</a>" applies."</string> diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml index 48f82f978..e40f98b3b 100644 --- a/java/res/values-es-rUS/strings.xml +++ b/java/res/values-es-rUS/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Más"</string> <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> <string name="label_wait_key" msgid="6402152600878093134">"Espera"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Eliminar"</string> - <string name="description_return_key" msgid="8750044000806461678">"Volver"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Configuración"</string> - <string name="description_shift_key" msgid="346906866277787836">"Mayús"</string> - <string name="description_space_key" msgid="8512130111575878517">"Espacio"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Símbolos"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Entrada de voz"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Símbolos activados"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Símbolos desactivados"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Mayús activado"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Mayús desactivado"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Entrada por voz"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"La entrada por voz no está admitida en tu idioma, pero sí funciona en inglés."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"La entrada de voz usa el reconocimiento de voz de Google. "<a href="http://m.google.com/privacy">"Se aplica la política de privacidad para"</a>" celulares."</string> diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml index 2116044c1..e1532427a 100644 --- a/java/res/values-es/strings.xml +++ b/java/res/values-es/strings.xml @@ -67,18 +67,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Más"</string> <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> <string name="label_wait_key" msgid="6402152600878093134">"Espera"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Eliminar"</string> - <string name="description_return_key" msgid="8750044000806461678">"Retroceso"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Ajustes"</string> - <string name="description_shift_key" msgid="346906866277787836">"Mayús"</string> - <string name="description_space_key" msgid="8512130111575878517">"Espacio"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Símbolos"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tabulador"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Entrada de voz"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Símbolos activados"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Símbolos desactivados"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Mayús activadas"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Mayús desactivadas"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Introducción de voz"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Actualmente la introducción de voz no está disponible en tu idioma, pero se puede utilizar en inglés."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"La entrada de voz utiliza el reconocimiento de voz de Google. Se aplica la "<a href="http://m.google.com/privacy">"Política de privacidad de Google para móviles"</a>"."</string> diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml index e57eb8a03..25ee9dff8 100644 --- a/java/res/values-fa/strings.xml +++ b/java/res/values-fa/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"بیشتر"</string> <string name="label_pause_key" msgid="181098308428035340">"توقف موقت"</string> <string name="label_wait_key" msgid="6402152600878093134">"منتظر بمانید"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Delete"</string> - <string name="description_return_key" msgid="8750044000806461678">"Return"</string> - <string name="description_settings_key" msgid="7484527796782969219">"تنظیمات"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"فاصله"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"نمادها"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"ورودی صوتی"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"نمادها روشن"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"نمادها خاموش"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift روشن"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift خاموش"</string> <string name="voice_warning_title" msgid="4419354150908395008">"ورودی صوتی"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"ورودی صوتی در حال حاضر برای زبان شما پشتیبانی نمی شود اما برای زبان انگلیسی فعال است."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"ورودی صوتی از تشخیص صدای Google استفاده می کند. "<a href="http://m.google.com/privacy">"خط مشی رازداری Mobile "</a>" اعمال می شود."</string> diff --git a/java/res/values-fi/strings.xml b/java/res/values-fi/strings.xml index 5be26f1e6..f02e8217d 100644 --- a/java/res/values-fi/strings.xml +++ b/java/res/values-fi/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Lisää"</string> <string name="label_pause_key" msgid="181098308428035340">"Tauko"</string> <string name="label_wait_key" msgid="6402152600878093134">"Odota"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Poista"</string> - <string name="description_return_key" msgid="8750044000806461678">"Rivinvaihto"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Asetukset"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Välilyönti"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Symbolit"</string> - <string name="description_tab_key" msgid="828186583738307137">"Sarkain"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Äänisyöte"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Symbolit käytössä"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Symbolit pois käytöstä"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift käytössä"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift pois käytöstä"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Äänisyöte"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Äänisyötettä ei vielä tueta kielelläsi, mutta voit käyttää sitä englanniksi."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Äänisyöte käyttää Googlen puheentunnistusta. "<a href="http://m.google.com/privacy">"Mobile-tietosuojakäytäntö"</a>" on voimassa."</string> diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml index 0526899df..276aed2c5 100644 --- a/java/res/values-fr/strings.xml +++ b/java/res/values-fr/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Plus"</string> <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> <string name="label_wait_key" msgid="6402152600878093134">"Attente"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Supprimer"</string> - <string name="description_return_key" msgid="8750044000806461678">"Entrée"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Paramètres"</string> - <string name="description_shift_key" msgid="346906866277787836">"Maj"</string> - <string name="description_space_key" msgid="8512130111575878517">"Espace"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Symboles"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tabulation"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Saisie vocale"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Symboles activés"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Symboles désactivés"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Maj activée"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Maj désactivée"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Saisie vocale"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"La saisie vocale n\'est pas encore prise en charge pour votre langue, mais elle fonctionne en anglais."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"La saisie vocale fait appel à la reconnaissance vocale de Google. Les "<a href="http://m.google.com/privacy">"Règles de confidentialité Google Mobile"</a>" s\'appliquent."</string> diff --git a/java/res/values-hr/strings.xml b/java/res/values-hr/strings.xml index 0307afa0c..6117821ee 100644 --- a/java/res/values-hr/strings.xml +++ b/java/res/values-hr/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Više"</string> <string name="label_pause_key" msgid="181098308428035340">"Pauza"</string> <string name="label_wait_key" msgid="6402152600878093134">"Pričekaj"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Delete"</string> - <string name="description_return_key" msgid="8750044000806461678">"Enter"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Postavke"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Razmaknica"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Simboli"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tabulator"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Glasovni unos"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Simboli uključeni"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Simboli isključeni"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift uključen"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift isključen"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Glasovni unos"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Vaš jezik trenutno nije podržan za glasovni unos, ali radi za engleski."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Glasovni unos upotrebljava Googleovo prepoznavanje govora. Primjenjuju se "<a href="http://m.google.com/privacy">"Pravila o privatnosti za uslugu Mobile"</a>"."</string> diff --git a/java/res/values-hu/strings.xml b/java/res/values-hu/strings.xml index e2c1decb3..81255d719 100644 --- a/java/res/values-hu/strings.xml +++ b/java/res/values-hu/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Egyebek"</string> <string name="label_pause_key" msgid="181098308428035340">"Szün."</string> <string name="label_wait_key" msgid="6402152600878093134">"Vár"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Törlés"</string> - <string name="description_return_key" msgid="8750044000806461678">"Vissza"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Beállítások"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Szóköz"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Szimbólumok"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Hangbevitel"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Szimbólumok be"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Szimbólumok ki"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift be"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift ki"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Hangbevitel"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"A hangbevitel szolgáltatás jelenleg nem támogatja az Ön nyelvét, ám angolul működik."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"A hangbevitel a Google beszédfelismerő technológiáját használja, amelyre a "<a href="http://m.google.com/privacy">"Mobil adatvédelmi irányelvek"</a>" érvényesek."</string> diff --git a/java/res/values-in/strings.xml b/java/res/values-in/strings.xml index 4abc4e51b..32ef38d35 100644 --- a/java/res/values-in/strings.xml +++ b/java/res/values-in/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Lainnya"</string> <string name="label_pause_key" msgid="181098308428035340">"Jeda"</string> <string name="label_wait_key" msgid="6402152600878093134">"Tunggu"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Hapus"</string> - <string name="description_return_key" msgid="8750044000806461678">"Enter"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Setelan"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Spasi"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Simbol"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Masukan Suara"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Simbol hidup"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Simbol mati"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift hidup"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift mati"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Masukan suara"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Masukan suara saat ini tidak didukung untuk bahasa Anda, tetapi bekerja dalam Bahasa Inggris."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Masukan suara menggunakan pengenalan ucapan Google. "<a href="http://m.google.com/privacy">"Kebijakan Privasi Seluler"</a>" berlaku."</string> diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml index d661c8975..3a896fcd7 100644 --- a/java/res/values-it/strings.xml +++ b/java/res/values-it/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Altro"</string> <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> <string name="label_wait_key" msgid="6402152600878093134">"Attesa"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Cancella"</string> - <string name="description_return_key" msgid="8750044000806461678">"Invio"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Impostazioni"</string> - <string name="description_shift_key" msgid="346906866277787836">"Maiuscolo"</string> - <string name="description_space_key" msgid="8512130111575878517">"Spazio"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Simboli"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tabulazione"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Input vocale"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Simboli attivati"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Simboli disattivati"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Maiuscole attivate"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Maiuscole disattivate"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Comandi vocali"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"I comandi vocali non sono attualmente supportati per la tua lingua ma funzionano in inglese."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"L\'input vocale utilizza il riconoscimento vocale di Google. Sono valide le "<a href="http://m.google.com/privacy">"norme sulla privacy di Google Mobile"</a>"."</string> diff --git a/java/res/values-iw/strings.xml b/java/res/values-iw/strings.xml index 678804449..0b26ed9fe 100644 --- a/java/res/values-iw/strings.xml +++ b/java/res/values-iw/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"עוד"</string> <string name="label_pause_key" msgid="181098308428035340">"השהה"</string> <string name="label_wait_key" msgid="6402152600878093134">"המתן"</string> - <string name="description_delete_key" msgid="5586406298531883960">"מחק"</string> - <string name="description_return_key" msgid="8750044000806461678">"חזור"</string> - <string name="description_settings_key" msgid="7484527796782969219">"הגדרות"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"רווח"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"סמלים"</string> - <string name="description_tab_key" msgid="828186583738307137">"כרטיסייה"</string> - <string name="description_voice_key" msgid="3057731675774652754">"קלט קולי"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"מצב סמלים פועל"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"מצב סמלים כבוי"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift פועל"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift כבוי"</string> <string name="voice_warning_title" msgid="4419354150908395008">"קלט קולי"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"קלט קולי אינו נתמך בשלב זה בשפתך, אך הוא פועל באנגלית."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"קלט קולי משתמש בזיהוי דיבור של Google. "<a href="http://m.google.com/privacy">"מדיניות הפרטיות של \'Google לנייד\'"</a>" חלה במקרה זה."</string> diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index 3c6ba0d3a..402c35675 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Shift"</string> <string name="label_pause_key" msgid="181098308428035340">"停止"</string> <string name="label_wait_key" msgid="6402152600878093134">"待機"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Del"</string> - <string name="description_return_key" msgid="8750044000806461678">"Enter"</string> - <string name="description_settings_key" msgid="7484527796782969219">"設定"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Space"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"記号"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"音声入力"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"記号ON"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"記号OFF"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift ON"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift OFF"</string> <string name="voice_warning_title" msgid="4419354150908395008">"音声入力"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"音声入力は現在英語には対応していますが、日本語には対応していません。"</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"音声入力ではGoogleの音声認識技術を利用します。"<a href="http://m.google.com/privacy">"モバイルプライバシーポリシー"</a>"が適用されます。"</string> diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml index 01484d797..ca2f570a8 100644 --- a/java/res/values-ko/strings.xml +++ b/java/res/values-ko/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"더보기"</string> <string name="label_pause_key" msgid="181098308428035340">"일시 중지"</string> <string name="label_wait_key" msgid="6402152600878093134">"대기"</string> - <string name="description_delete_key" msgid="5586406298531883960">"삭제"</string> - <string name="description_return_key" msgid="8750044000806461678">"리턴"</string> - <string name="description_settings_key" msgid="7484527796782969219">"설정"</string> - <string name="description_shift_key" msgid="346906866277787836">"시프트"</string> - <string name="description_space_key" msgid="8512130111575878517">"스페이스"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"기호"</string> - <string name="description_tab_key" msgid="828186583738307137">"탭"</string> - <string name="description_voice_key" msgid="3057731675774652754">"음성 입력"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"기호 사용"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"기호 사용 안함"</string> - <string name="description_shift_on" msgid="6983188949895971587">"시프트 사용"</string> - <string name="description_shift_off" msgid="8553265474523069034">"시프트 사용 안함"</string> <string name="voice_warning_title" msgid="4419354150908395008">"음성 입력"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"음성 입력은 현재 자국어로 지원되지 않으며 영어로 작동됩니다."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"음성 입력에서는 Google의 음성 인식 기능을 사용합니다. "<a href="http://m.google.com/privacy">"모바일 개인정보취급방침"</a>"이 적용됩니다."</string> diff --git a/java/res/values-lt/strings.xml b/java/res/values-lt/strings.xml index e808426a8..fbe50e005 100644 --- a/java/res/values-lt/strings.xml +++ b/java/res/values-lt/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Daugiau"</string> <string name="label_pause_key" msgid="181098308428035340">"Prist."</string> <string name="label_wait_key" msgid="6402152600878093134">"Lauk."</string> - <string name="description_delete_key" msgid="5586406298531883960">"Ištrinti"</string> - <string name="description_return_key" msgid="8750044000806461678">"Grįžti"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Nustatymai"</string> - <string name="description_shift_key" msgid="346906866277787836">"Keitimas"</string> - <string name="description_space_key" msgid="8512130111575878517">"Tarpas"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Simboliai"</string> - <string name="description_tab_key" msgid="828186583738307137">"Skirtukas"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Balso įvestis"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Simboliai įjungti"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Simboliai išjungti"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Keitimas įjungtas"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Keitimas išjungtas"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Balso įvestis"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Šiuo metu balso įvestis jūsų kompiuteryje nepalaikoma, bet ji veikia anglų k."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Balso įvesčiai naudojamas „Google“ kalbos atpažinimas. Taikoma "<a href="http://m.google.com/privacy">"privatumo politika mobiliesiems"</a>"."</string> diff --git a/java/res/values-lv/strings.xml b/java/res/values-lv/strings.xml index 69d4ba092..84bee5382 100644 --- a/java/res/values-lv/strings.xml +++ b/java/res/values-lv/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Vairāk"</string> <string name="label_pause_key" msgid="181098308428035340">"Pauze"</string> <string name="label_wait_key" msgid="6402152600878093134">"Gaidīt"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Dzēšanas taustiņš"</string> - <string name="description_return_key" msgid="8750044000806461678">"Atgriešanās taustiņš"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Iestatījumu taustiņš"</string> - <string name="description_shift_key" msgid="346906866277787836">"Pārslēgšanas taustiņš"</string> - <string name="description_space_key" msgid="8512130111575878517">"Atstarpes taustiņš"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Simbolu taustiņš"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tabulēšanas taustiņš"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Runas ievades taustiņš"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Simbolu režīms ir ieslēgts."</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Simbolu režīms ir izslēgts."</string> - <string name="description_shift_on" msgid="6983188949895971587">"Pārslēgšanas režīms ir ieslēgts."</string> - <string name="description_shift_off" msgid="8553265474523069034">"Pārslēgšanas režīms ir izslēgts."</string> <string name="voice_warning_title" msgid="4419354150908395008">"Balss ievade"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Balss ievade jūsu valodā pašlaik netiek atbalstīta, taču tā ir pieejama angļu valodā."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Balss ievadei tiek izmantota Google runas atpazīšanas funkcija. Uz šīs funkcijas lietošanu attiecas "<a href="http://m.google.com/privacy">"mobilo sakaru ierīču lietošanas konfidencialitātes politika"</a>"."</string> diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml index 8b4874d91..e20c9515e 100644 --- a/java/res/values-nb/strings.xml +++ b/java/res/values-nb/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Mer"</string> <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> <string name="label_wait_key" msgid="6402152600878093134">"Vent"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Delete"</string> - <string name="description_return_key" msgid="8750044000806461678">"Enter"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Innstillinger"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Mellomrom"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Symboler"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Taleinndata"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Symboler er slått på"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Symboler er slått av"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift på"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift av"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Stemmedata"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Stemmedata håndteres foreløpig ikke på ditt språk, men fungerer på engelsk."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Google Voice bruker Googles talegjenkjenning. "<a href="http://m.google.com/privacy">"Personvernreglene for mobil"</a>" gjelder."</string> diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml index ab3f1857d..89b714bc8 100644 --- a/java/res/values-nl/strings.xml +++ b/java/res/values-nl/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Meer"</string> <string name="label_pause_key" msgid="181098308428035340">"Onderbr."</string> <string name="label_wait_key" msgid="6402152600878093134">"Wacht"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Delete"</string> - <string name="description_return_key" msgid="8750044000806461678">"Return"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Instellingen"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Spatie"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Symbolen"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Spraakinvoer"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Symbolen aan"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Symbolen uit"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift aan"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift uit"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Spraakinvoer"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Spraakinvoer wordt momenteel niet ondersteund in uw taal, maar is wel beschikbaar in het Engels."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Spraakinvoer maakt gebruik van de spraakherkenning van Google. Het "<a href="http://m.google.com/privacy">"Privacybeleid van Google Mobile"</a>" is van toepassing."</string> diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml index bc352f036..65240d748 100644 --- a/java/res/values-pl/strings.xml +++ b/java/res/values-pl/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Więcej"</string> <string name="label_pause_key" msgid="181098308428035340">"Pauza"</string> <string name="label_wait_key" msgid="6402152600878093134">"Czekaj"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Delete"</string> - <string name="description_return_key" msgid="8750044000806461678">"Enter"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Ustawienia"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Spacja"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Symbole"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Wprowadzanie głosowe"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Symbole włączone"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Symbole wyłączone"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift włączony"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift wyłączony"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Wprowadzanie głosowe"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Wprowadzanie głosowe obecnie nie jest obsługiwane w Twoim języku, ale działa w języku angielskim."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Funkcja wprowadzania głosowego wykorzystuje mechanizm rozpoznawania mowy. Obowiązuje "<a href="http://m.google.com/privacy">"Polityka prywatności Google Mobile"</a>"."</string> diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml index b881d880f..b972ce049 100644 --- a/java/res/values-pt-rPT/strings.xml +++ b/java/res/values-pt-rPT/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Mais"</string> <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> <string name="label_wait_key" msgid="6402152600878093134">"Esp."</string> - <string name="description_delete_key" msgid="5586406298531883960">"Delete"</string> - <string name="description_return_key" msgid="8750044000806461678">"Enter"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Definições"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Espaço"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Símbolos"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Entrada de voz"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Símbolos ativados"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Símbolos desativados"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift ativado"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift desativado"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Entrada de voz"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Actualmente, a entrada de voz não é suportada para o seu idioma, mas funciona em inglês."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"A entrada de voz utiliza o reconhecimento de voz da Google. É aplicável a "<a href="http://m.google.com/privacy">"Política de privacidade do Google Mobile"</a>"."</string> diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml index dedd06e97..a999dc67e 100644 --- a/java/res/values-pt/strings.xml +++ b/java/res/values-pt/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Mais"</string> <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> <string name="label_wait_key" msgid="6402152600878093134">"Esp."</string> - <string name="description_delete_key" msgid="5586406298531883960">"Excluir"</string> - <string name="description_return_key" msgid="8750044000806461678">"Voltar"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Configurações"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Espaço"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Símbolos"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Entrada de texto por voz"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Símbolos ativados"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Símbolos desativados"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift ativado"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift desativado"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Entrada de voz"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"A entrada de voz não é suportada no momento para o seu idioma, mas funciona em inglês."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"A entrada de texto por voz usa o reconhecimento de voz do Google. "<a href="http://m.google.com/privacy">"A política de privacidade para celulares"</a>" é aplicada."</string> diff --git a/java/res/values-rm/strings.xml b/java/res/values-rm/strings.xml index 8328fc9e8..b0c1bea24 100644 --- a/java/res/values-rm/strings.xml +++ b/java/res/values-rm/strings.xml @@ -85,30 +85,6 @@ <skip /> <!-- no translation found for label_wait_key (6402152600878093134) --> <skip /> - <!-- no translation found for description_delete_key (5586406298531883960) --> - <skip /> - <!-- no translation found for description_return_key (8750044000806461678) --> - <skip /> - <!-- no translation found for description_settings_key (7484527796782969219) --> - <skip /> - <!-- no translation found for description_shift_key (346906866277787836) --> - <skip /> - <!-- no translation found for description_space_key (8512130111575878517) --> - <skip /> - <!-- no translation found for description_switch_alpha_symbol_key (4537975384274405537) --> - <skip /> - <!-- no translation found for description_tab_key (828186583738307137) --> - <skip /> - <!-- no translation found for description_voice_key (3057731675774652754) --> - <skip /> - <!-- no translation found for description_symbols_on (2994366855822840559) --> - <skip /> - <!-- no translation found for description_symbols_off (3209578267079515136) --> - <skip /> - <!-- no translation found for description_shift_on (6983188949895971587) --> - <skip /> - <!-- no translation found for description_shift_off (8553265474523069034) --> - <skip /> <string name="voice_warning_title" msgid="4419354150908395008">"Cumonds vocals"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"\"Cumonds vocals en Vossa lingua na vegnan actualmain betg sustegnids, ma la funcziun è disponibla per englais.\""</string> <!-- outdated translation 4611518823070986445 --> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Ils cumonds vocals èn ina funcziunalitad experimentala che utilisescha la renconuschientscha vocala da rait da Google."</string> diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml index 680bdb8b1..0fcefd1f2 100644 --- a/java/res/values-ro/strings.xml +++ b/java/res/values-ro/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Mai multe"</string> <string name="label_pause_key" msgid="181098308428035340">"Pauză"</string> <string name="label_wait_key" msgid="6402152600878093134">"Aşt."</string> - <string name="description_delete_key" msgid="5586406298531883960">"Ştergeţi"</string> - <string name="description_return_key" msgid="8750044000806461678">"Tasta Enter"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Setări"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Tasta Space"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Simboluri"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tasta Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Intrare vocală"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Simbolurile sunt activate"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Simbolurile sunt dezactivate"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Tasta Shift este activată"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Tasta Shift este dezactivată"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Intrare voce"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Intrarea vocală nu este acceptată în prezent pentru limba dvs., însă funcţionează în limba engleză."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Intrarea vocală utilizează funcţia Google de recunoaştere vocală. Se aplică "<a href="http://m.google.com/privacy">"Politica de confidenţialitate Google Mobil"</a>"."</string> diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml index ae3138ba1..2e8577ea1 100644 --- a/java/res/values-ru/strings.xml +++ b/java/res/values-ru/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Ещё"</string> <string name="label_pause_key" msgid="181098308428035340">"Приостановить"</string> <string name="label_wait_key" msgid="6402152600878093134">"Подождите"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Клавиша удаления"</string> - <string name="description_return_key" msgid="8750044000806461678">"Клавиша \"Ввод\""</string> - <string name="description_settings_key" msgid="7484527796782969219">"Клавиша настроек"</string> - <string name="description_shift_key" msgid="346906866277787836">"Клавиша верхнего регистра"</string> - <string name="description_space_key" msgid="8512130111575878517">"Клавиша \"Пробел\""</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Клавиша символов"</string> - <string name="description_tab_key" msgid="828186583738307137">"Клавиша табуляции"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Клавиша голосового ввода"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Клавиши символов выключены"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Клавиши символов включены"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Верхний регистр включен"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Верхний регистр выключен"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Голосовой ввод"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"В настоящее время функция голосового ввода не поддерживает ваш язык, но вы можете пользоваться ей на английском."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Голосовой ввод использует алгоритмы распознавания речи Google. Действует "<a href="http://m.google.com/privacy">"политика конфиденциальности для мобильных устройств"</a>"."</string> diff --git a/java/res/values-sk/strings.xml b/java/res/values-sk/strings.xml index 70f9f8bf7..eeefa820f 100644 --- a/java/res/values-sk/strings.xml +++ b/java/res/values-sk/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Viac"</string> <string name="label_pause_key" msgid="181098308428035340">"Pozastaviť"</string> <string name="label_wait_key" msgid="6402152600878093134">"Čakajte"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Delete"</string> - <string name="description_return_key" msgid="8750044000806461678">"Return"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Nastavenia"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Medzera"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Symboly"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Hlasový vstup"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Symboly zapnuté"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Symboly vypnuté"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift zapnutý"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift vypnutý"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Hlasový vstup"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Pre váš jazyk aktuálne nie je hlasový vstup podporovaný, ale funguje v angličtine."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Hlasový vstup používa rozpoznávanie hlasu Google. Na používanie hlasového vstupu sa vzťahujú "<a href="http://m.google.com/privacy">"Pravidlá ochrany osobných údajov pre mobilné služby"</a>"."</string> diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml index babf8b097..91f9036e6 100644 --- a/java/res/values-sl/strings.xml +++ b/java/res/values-sl/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Več"</string> <string name="label_pause_key" msgid="181098308428035340">"Premor"</string> <string name="label_wait_key" msgid="6402152600878093134">"Čakaj"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Izbriši"</string> - <string name="description_return_key" msgid="8750044000806461678">"Vračalka"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Nastavitve"</string> - <string name="description_shift_key" msgid="346906866277787836">"Dvigalka"</string> - <string name="description_space_key" msgid="8512130111575878517">"Preslednica"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Znaki"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tabulatorka"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Glasovni vnos"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Znaki vklopljeni"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Znaki izklopljeni"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Dvigalka vklopljena"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Dvigalka izklopljena"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Glasovni vnos"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Glasovni vnos trenutno ni podprt v vašem jeziku, deluje pa v angleščini."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Glasovni vnos uporablja Googlovo prepoznavanje govora. Zanj velja "<a href="http://m.google.com/privacy">"pravilnik o zasebnosti za mobilne naprave"</a>"."</string> diff --git a/java/res/values-sr/strings.xml b/java/res/values-sr/strings.xml index 7a90fbfdc..b20f1df2e 100644 --- a/java/res/values-sr/strings.xml +++ b/java/res/values-sr/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Још"</string> <string name="label_pause_key" msgid="181098308428035340">"Паузирај"</string> <string name="label_wait_key" msgid="6402152600878093134">"Сачекајте"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Delete"</string> - <string name="description_return_key" msgid="8750044000806461678">"Return"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Подешавања"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Размак"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Симболи"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Гласовни унос"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Симболи су укључени"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Симболи су искључени"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift је укључен"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift је искључен"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Гласовни унос"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Гласовни унос тренутно није подржан за ваш језик, али функционише на енглеском."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Гласовни унос користи Google-ову функцију за препознавање гласа. Примењује се "<a href="http://m.google.com/privacy">"политика приватности за мобилне уређаје"</a>"."</string> diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml index 922cbf7de..2d35fd87b 100644 --- a/java/res/values-sv/strings.xml +++ b/java/res/values-sv/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Mer"</string> <string name="label_pause_key" msgid="181098308428035340">"Pausa"</string> <string name="label_wait_key" msgid="6402152600878093134">"Vänta"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Ta bort"</string> - <string name="description_return_key" msgid="8750044000806461678">"Retur"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Inställningar"</string> - <string name="description_shift_key" msgid="346906866277787836">"Skift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Blanksteg"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Symboler"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tabb"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Röstinmatning"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Aktivera symboler"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Inaktivera symboler"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Aktivera Skift"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Inaktivera Skift"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Röstindata"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Röstindata stöds inte på ditt språk än, men tjänsten fungerar på engelska."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Röstinmatning använder sig av Googles tjänst för taligenkänning. "<a href="http://m.google.com/privacy">"Sekretesspolicyn för mobila enheter"</a>" gäller."</string> diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml index de75300ef..cd7fe95c0 100644 --- a/java/res/values-th/strings.xml +++ b/java/res/values-th/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"เพิ่มเติม"</string> <string name="label_pause_key" msgid="181098308428035340">"หยุดชั่วคราว"</string> <string name="label_wait_key" msgid="6402152600878093134">"รอ"</string> - <string name="description_delete_key" msgid="5586406298531883960">"ลบ"</string> - <string name="description_return_key" msgid="8750044000806461678">"Return"</string> - <string name="description_settings_key" msgid="7484527796782969219">"การตั้งค่า"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Space"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"สัญลักษณ์"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"ป้อนข้อมูลด้วยเสียง"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"สัญลักษณ์เปิดอยู่"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"สัญลักษณ์ปิดอยู่"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift เปิดอยู่"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift ปิดอยู่"</string> <string name="voice_warning_title" msgid="4419354150908395008">"การป้อนข้อมูลด้วยเสียง"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"ขณะนี้การป้อนข้อมูลด้วยเสียงยังไม่ได้รับการสนับสนุนในภาษาของคุณ แต่ใช้ได้ในภาษาอังกฤษ"</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"ป้อนข้อมูลด้วยเสียงใช้การจดจำคำพูดของ Google "<a href="http://m.google.com/privacy">" นโยบายส่วนบุคคลของมือถือ"</a>"มีผลบังคับใช้"</string> diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml index 779c56b4f..da62eafc6 100644 --- a/java/res/values-tl/strings.xml +++ b/java/res/values-tl/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Higit pa"</string> <string name="label_pause_key" msgid="181098308428035340">"Pause"</string> <string name="label_wait_key" msgid="6402152600878093134">"Intay"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Tanggalin"</string> - <string name="description_return_key" msgid="8750044000806461678">"Bumalik"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Mga Setting"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Puwang"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Mga Simbolo"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Input ng Boses"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Naka-on ang mga simbolo"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Naka-off ang mga simbolo"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Naka-on ang shift"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Naka-off ang shift"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Pag-input ng boses"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Hindi kasalukuyang suportado ang pag-input ng boses para sa iyong wika, ngunit gumagana sa Ingles."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Gumagamit ang pag-input ng boses ng speech recognition ng Google. Nalalapat "<a href="http://m.google.com/privacy">"Ang Patakaran sa Privacy ng Mobile"</a>"."</string> diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml index cb993619b..2607ae257 100644 --- a/java/res/values-tr/strings.xml +++ b/java/res/values-tr/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Diğer"</string> <string name="label_pause_key" msgid="181098308428035340">"Durkl"</string> <string name="label_wait_key" msgid="6402152600878093134">"Bekle"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Sil"</string> - <string name="description_return_key" msgid="8750044000806461678">"Return"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Ayarlar"</string> - <string name="description_shift_key" msgid="346906866277787836">"Üst Karakter"</string> - <string name="description_space_key" msgid="8512130111575878517">"Boşluk"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Simgeler"</string> - <string name="description_tab_key" msgid="828186583738307137">"Sekme"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Ses Girişi"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Simgeler açık"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Simgeler kapalı"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Üst Karakter açık"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Üst Karakter kapalı"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Ses girişi"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Ses girişi, şu anda sizin diliniz için desteklenmiyor ama İngilizce dilinde kullanılabilir."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Ses girişi Google\'ın konuşma tanıma işlevini kullanır. "<a href="http://m.google.com/privacy">" Mobil Gizlilik Politikası"</a>" geçerlidir."</string> diff --git a/java/res/values-uk/strings.xml b/java/res/values-uk/strings.xml index ad2665544..a2f589d1d 100644 --- a/java/res/values-uk/strings.xml +++ b/java/res/values-uk/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Більше"</string> <string name="label_pause_key" msgid="181098308428035340">"Пауза"</string> <string name="label_wait_key" msgid="6402152600878093134">"Чек."</string> - <string name="description_delete_key" msgid="5586406298531883960">"Клавіша Delete"</string> - <string name="description_return_key" msgid="8750044000806461678">"Клавіша Return"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Клавіша Settings"</string> - <string name="description_shift_key" msgid="346906866277787836">"Клавіша Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Клавіша Space"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Клавіша Symbols"</string> - <string name="description_tab_key" msgid="828186583738307137">"Клавіша Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Клавіша Voice Input"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Символи ввімкнено"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Символи вимкнено"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift увімкнено"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift вимкнено"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Голос. ввід"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Голос. ввід наразі не підтрим. для вашої мови, але можна користуватися англійською."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Голосовий ввід використовує розпізнавання мовлення Google. Застосовується "<a href="http://m.google.com/privacy">"Політика конфіденційності для мобільних пристроїв"</a>"."</string> diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml index cc74b4ea5..81be8264e 100644 --- a/java/res/values-vi/strings.xml +++ b/java/res/values-vi/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"Khác"</string> <string name="label_pause_key" msgid="181098308428035340">"Tạm dừng"</string> <string name="label_wait_key" msgid="6402152600878093134">"Đợi"</string> - <string name="description_delete_key" msgid="5586406298531883960">"Xóa"</string> - <string name="description_return_key" msgid="8750044000806461678">"Quay lại"</string> - <string name="description_settings_key" msgid="7484527796782969219">"Cài đặt"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"Dấu cách"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"Biểu tượng"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"Nhập liệu bằng giọng nói"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"Bật biểu tượng"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"Tắt biểu tượng"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Bật Shift"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Tắt Shift"</string> <string name="voice_warning_title" msgid="4419354150908395008">"Nhập liệu bằng giọng nói"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Nhập liệu bằng giọng nói hiện không được hỗ trợ cho ngôn ngữ của bạn nhưng hoạt động với ngôn ngữ tiếng Anh."</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"Nhập liệu bằng giọng nói sử dụng nhận dạng giọng nói của Google. Áp dụng "<a href="http://m.google.com/privacy">"Chính sách bảo mật dành cho điện thoại di động"</a>"."</string> diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml index a8edf1039..1f15831b3 100644 --- a/java/res/values-zh-rCN/strings.xml +++ b/java/res/values-zh-rCN/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"更多"</string> <string name="label_pause_key" msgid="181098308428035340">"暂停"</string> <string name="label_wait_key" msgid="6402152600878093134">"等待"</string> - <string name="description_delete_key" msgid="5586406298531883960">"删除"</string> - <string name="description_return_key" msgid="8750044000806461678">"回车"</string> - <string name="description_settings_key" msgid="7484527796782969219">"设置"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift"</string> - <string name="description_space_key" msgid="8512130111575878517">"空格"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"符号"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab"</string> - <string name="description_voice_key" msgid="3057731675774652754">"语音输入"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"符号模式已打开"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"符号模式已关闭"</string> - <string name="description_shift_on" msgid="6983188949895971587">"Shift 模式已打开"</string> - <string name="description_shift_off" msgid="8553265474523069034">"Shift 模式已关闭"</string> <string name="voice_warning_title" msgid="4419354150908395008">"语音输入"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"语音输入功能当前还不支持您的语言，您只能输入英语语音。"</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"语音输入采用了 Google 的语音识别技术，因此请遵守"<a href="http://m.google.com/privacy">"“Google 移动”隐私权政策"</a>"。"</string> diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml index 58e2bcd45..8a89aeb08 100644 --- a/java/res/values-zh-rTW/strings.xml +++ b/java/res/values-zh-rTW/strings.xml @@ -61,18 +61,6 @@ <string name="label_more_key" msgid="3760239494604948502">"更多"</string> <string name="label_pause_key" msgid="181098308428035340">"暫停"</string> <string name="label_wait_key" msgid="6402152600878093134">"等候"</string> - <string name="description_delete_key" msgid="5586406298531883960">"刪除"</string> - <string name="description_return_key" msgid="8750044000806461678">"返回"</string> - <string name="description_settings_key" msgid="7484527796782969219">"設定"</string> - <string name="description_shift_key" msgid="346906866277787836">"Shift 鍵"</string> - <string name="description_space_key" msgid="8512130111575878517">"空白鍵"</string> - <string name="description_switch_alpha_symbol_key" msgid="4537975384274405537">"符號"</string> - <string name="description_tab_key" msgid="828186583738307137">"Tab 鍵"</string> - <string name="description_voice_key" msgid="3057731675774652754">"語音輸入"</string> - <string name="description_symbols_on" msgid="2994366855822840559">"開啟符號"</string> - <string name="description_symbols_off" msgid="3209578267079515136">"關閉符號"</string> - <string name="description_shift_on" msgid="6983188949895971587">"開啟位移"</string> - <string name="description_shift_off" msgid="8553265474523069034">"關閉位移"</string> <string name="voice_warning_title" msgid="4419354150908395008">"語音輸入"</string> <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"語音輸入目前不支援您的語言，但是可以辨識英文。"</string> <string name="voice_warning_may_not_understand" msgid="5596289095878251072">"語音輸入使用 Google 的語音辨識功能，並遵循《"<a href="http://m.google.com/privacy">"行動服務隱私權政策"</a>"》。"</string> diff --git a/java/res/values/keycodes.xml b/java/res/values/keycodes.xml index 7145af574..d5926ecfd 100644 --- a/java/res/values/keycodes.xml +++ b/java/res/values/keycodes.xml @@ -31,24 +31,4 @@ <integer name="key_delete">-5</integer> <integer name="key_settings">-6</integer> <integer name="key_shortcut">-8</integer> - - <!-- Array used for mapping key codes to description strings. --> - <array name="key_descriptions"> - <item>@integer/key_tab</item> - <item>@string/description_tab_key</item> - <item>@integer/key_return</item> - <item>@string/description_return_key</item> - <item>@integer/key_space</item> - <item>@string/description_space_key</item> - <item>@integer/key_shift</item> - <item>@string/description_shift_key</item> - <item>@integer/key_switch_alpha_symbol</item> - <item>@string/description_switch_alpha_symbol_key</item> - <item>@integer/key_delete</item> - <item>@string/description_delete_key</item> - <item>@integer/key_settings</item> - <item>@string/description_settings_key</item> - <item>@integer/key_shortcut</item> - <item>@string/description_voice_key</item> - </array> </resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index cb4319597..51fafd4f1 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -114,31 +114,6 @@ <!-- Label for "Wait" key of phone number keyboard. Must be short to fit on key! [CHAR LIMIT=5]--> <string name="label_wait_key">Wait</string> - <!-- Spoken text description for delete key. --> - <string name="description_delete_key">Delete</string> - <!-- Spoken text description for return key. --> - <string name="description_return_key">Return</string> - <!-- Spoken text description for settings key. --> - <string name="description_settings_key">Settings</string> - <!-- Spoken text description for shift key. --> - <string name="description_shift_key">Shift</string> - <!-- Spoken text description for space key. --> - <string name="description_space_key">Space</string> - <!-- Spoken text description for symbols key. --> - <string name="description_switch_alpha_symbol_key">Symbols</string> - <!-- Spoken text description for tab key. --> - <string name="description_tab_key">Tab</string> - <!-- Spoken text description for voice input key. --> - <string name="description_voice_key">Voice Input</string> - <!-- Spoken text description for symbols mode on. --> - <string name="description_symbols_on">Symbols on</string> - <!-- Spoken text description for symbols mode off. --> - <string name="description_symbols_off">Symbols off</string> - <!-- Spoken text description for shift mode on. --> - <string name="description_shift_on">Shift on</string> - <!-- Spoken text description for shift mode off. --> - <string name="description_shift_off">Shift off</string> - <!-- Voice related labels --> <!-- Title of the warning dialog that shows when a user initiates voice input for diff --git a/java/res/xml-xlarge/kbd_sr_rows.xml b/java/res/xml-xlarge/kbd_sr_rows.xml index ce9e20817..be0058505 100644 --- a/java/res/xml-xlarge/kbd_sr_rows.xml +++ b/java/res/xml-xlarge/kbd_sr_rows.xml @@ -30,7 +30,7 @@ <Key latin:keyStyle="tabKeyStyle" latin:keyLabelOption="alignLeft" - latin:keyWidth="7.949%p" + latin:keyWidth="8.640%p" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="љ" @@ -66,7 +66,7 @@ latin:keyLabel="ш" /> <Key latin:keyStyle="deleteKeyStyle" - latin:keyWidth="9.331%p" + latin:keyWidth="8.640%p" latin:keyEdgeFlags="right" /> </Row> <Row @@ -75,7 +75,7 @@ <Key latin:keyStyle="toSymbolKeyStyle" latin:keyLabelOption="alignLeft" - latin:keyWidth="7.949%p" + latin:keyWidth="8.640%p" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="а" /> @@ -101,7 +101,7 @@ latin:keyLabel="ћ" /> <Key latin:keyStyle="returnKeyStyle" - latin:keyWidth="9.331%p" + latin:keyWidth="8.640%p" latin:keyEdgeFlags="right" /> </Row> <Row @@ -109,12 +109,10 @@ > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="12.400%p" + latin:keyWidth="8.640%p" latin:keyEdgeFlags="left" /> <Key - latin:keyLabel="ђ" /> - <Key - latin:keyLabel="ж" /> + latin:keyLabel="ѕ" /> <Key latin:keyLabel="џ" /> <Key @@ -128,6 +126,10 @@ <Key latin:keyLabel="м" /> <Key + latin:keyLabel="ђ" /> + <Key + latin:keyLabel="ж" /> + <Key latin:keyLabel="," latin:manualTemporaryUpperCaseCode="33" latin:keyHintIcon="@drawable/key_hint_exclamation_holo" @@ -141,7 +143,7 @@ latin:popupCharacters="\?" /> <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="12.400%p" + latin:keyWidth="8.640%p" latin:keyEdgeFlags="right" /> </Row> <include diff --git a/java/res/xml/kbd_sr_rows.xml b/java/res/xml/kbd_sr_rows.xml index 4a5ed1195..8d6b070b2 100644 --- a/java/res/xml/kbd_sr_rows.xml +++ b/java/res/xml/kbd_sr_rows.xml @@ -73,7 +73,7 @@ latin:keyEdgeFlags="right" /> </Row> <Row - latin:keyWidth="8.333%p" + latin:keyWidth="9.09%p" > <Key latin:keyLabel="а" @@ -97,20 +97,17 @@ <Key latin:keyLabel="ч" /> <Key - latin:keyLabel="ћ" /> - <Key - latin:keyLabel="ђ" + latin:keyLabel="ћ" latin:keyEdgeFlags="right" /> </Row> <Row - latin:keyWidth="8.5%p" + latin:keyWidth="8.90%p" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="11.75%p" latin:keyEdgeFlags="left" /> <Key - latin:keyLabel="ж" /> + latin:keyLabel="ѕ" /> <Key latin:keyLabel="џ" /> <Key @@ -124,8 +121,12 @@ <Key latin:keyLabel="м" /> <Key + latin:keyLabel="ђ" /> + <Key + latin:keyLabel="ж" /> + <Key latin:keyStyle="deleteKeyStyle" - latin:keyWidth="11.75%p" + latin:keyWidth="11.00%p" latin:keyEdgeFlags="right" /> </Row> <include diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 4f1ad576d..333fbc779 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -340,8 +340,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha // state when shift key is pressed to go to normal mode. // On the other hand, on distinct multi touch panel device, turning off the shift locked // state with shift key pressing is handled by onReleaseShift(). - if ((!hasDistinctMultitouch() || isAccessibilityEnabled()) - && !shifted && latinKeyboard.isShiftLocked()) { + if (!hasDistinctMultitouch() && !shifted && latinKeyboard.isShiftLocked()) { latinKeyboard.setShiftLocked(false); } if (latinKeyboard.setShifted(shifted)) { @@ -439,9 +438,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha public void onPressShift(boolean withSliding) { if (!isKeyboardAvailable()) return; - // If accessibility is enabled, disable momentary shift lock. - if (isAccessibilityEnabled()) - return; ShiftKeyState shiftKeyState = mShiftKeyState; if (DEBUG_STATE) Log.d(TAG, "onPressShift:" @@ -478,9 +474,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha public void onReleaseShift(boolean withSliding) { if (!isKeyboardAvailable()) return; - // If accessibility is enabled, disable momentary shift lock. - if (isAccessibilityEnabled()) - return; ShiftKeyState shiftKeyState = mShiftKeyState; if (DEBUG_STATE) Log.d(TAG, "onReleaseShift:" @@ -518,9 +511,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha } public void onPressSymbol() { - // If accessibility is enabled, disable momentary symbol lock. - if (isAccessibilityEnabled()) - return; if (DEBUG_STATE) Log.d(TAG, "onPressSymbol:" + " keyboard=" + getLatinKeyboard().getKeyboardShiftState() @@ -531,9 +521,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha } public void onReleaseSymbol() { - // If accessibility is enabled, disable momentary symbol lock. - if (isAccessibilityEnabled()) - return; if (DEBUG_STATE) Log.d(TAG, "onReleaseSymbol:" + " keyboard=" + getLatinKeyboard().getKeyboardShiftState() @@ -547,9 +534,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha } public void onOtherKeyPressed() { - // If accessibility is enabled, disable momentary mode locking. - if (isAccessibilityEnabled()) - return; if (DEBUG_STATE) Log.d(TAG, "onOtherKeyPressed:" + " keyboard=" + getLatinKeyboard().getKeyboardShiftState() @@ -612,10 +596,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha } } - public boolean isAccessibilityEnabled() { - return mInputView != null && mInputView.isAccessibilityEnabled(); - } - public boolean hasDistinctMultitouch() { return mInputView != null && mInputView.hasDistinctMultitouch(); } diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index 08e739d5a..c551ed49f 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -134,9 +134,6 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { private int mOldPointerCount = 1; private int mOldKeyIndex; - // Accessibility - private boolean mIsAccessibilityEnabled; - protected KeyDetector mKeyDetector = new KeyDetector(); // Swipe gesture detector @@ -530,29 +527,7 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { } /** - * Enables or disables accessibility. - * @param accessibilityEnabled whether or not to enable accessibility - */ - public void setAccessibilityEnabled(boolean accessibilityEnabled) { - mIsAccessibilityEnabled = accessibilityEnabled; - - // Propagate this change to all existing pointer trackers. - for (PointerTracker tracker : mPointerTrackers) { - tracker.setAccessibilityEnabled(accessibilityEnabled); - } - } - - /** - * Returns whether the device has accessibility enabled. - * @return true if the device has accessibility enabled. - */ - @Override - public boolean isAccessibilityEnabled() { - return mIsAccessibilityEnabled; - } - - /** - * Enables or disables the key feedback preview. This is a preview that shows a magnified + * Enables or disables the key feedback popup. This is a popup that shows a magnified * version of the depressed key. By default the preview is enabled. * @param previewEnabled whether or not to enable the key feedback preview * @see #isKeyPreviewEnabled() @@ -1182,19 +1157,16 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { // TODO: cleanup this code into a multi-touch to single-touch event converter class? // If the device does not have distinct multi-touch support panel, ignore all multi-touch // events except a transition from/to single-touch. - if ((!mHasDistinctMultitouch || mIsAccessibilityEnabled) - && pointerCount > 1 && oldPointerCount > 1) { + if (!mHasDistinctMultitouch && pointerCount > 1 && oldPointerCount > 1) { return true; } // Track the last few movements to look for spurious swipes. mSwipeTracker.addMovement(me); - // Gesture detector must be enabled only when mini-keyboard is not on the screen and - // accessibility is not enabled. - // TODO: Reconcile gesture detection and accessibility features. - if (mPopupMiniKeyboardPanel == null && !mIsAccessibilityEnabled - && mGestureDetector != null && mGestureDetector.onTouchEvent(me)) { + // Gesture detector must be enabled only when mini-keyboard is not on the screen. + if (mPopupMiniKeyboardPanel == null && mGestureDetector != null + && mGestureDetector.onTouchEvent(me)) { dismissAllKeyPreviews(); mHandler.cancelKeyTimers(); return true; @@ -1225,7 +1197,7 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { // TODO: cleanup this code into a multi-touch to single-touch event converter class? // Translate mutli-touch event to single-touch events on the device that has no distinct // multi-touch panel. - if (!mHasDistinctMultitouch || mIsAccessibilityEnabled) { + if (!mHasDistinctMultitouch) { // Use only main (id=0) pointer tracker. PointerTracker tracker = getPointerTracker(0); if (pointerCount == 1 && oldPointerCount == 2) { diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java index efc446a0d..c98076f35 100644 --- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java @@ -140,10 +140,6 @@ public class LatinKeyboardView extends KeyboardView { // If device has distinct multi touch panel, there is no need to check sudden jump. if (hasDistinctMultitouch()) return false; - // If accessibiliy is enabled, stop looking for sudden jumps because it interferes - // with touch exploration of the keyboard. - if (isAccessibilityEnabled()) - return false; final int action = me.getAction(); final int x = (int) me.getX(); final int y = (int) me.getY(); diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java index abd1ef286..953d487dc 100644 --- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java +++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java @@ -41,7 +41,6 @@ public class PointerTracker { public void showKeyPreview(int keyIndex, PointerTracker tracker); public void dismissKeyPreview(PointerTracker tracker); public boolean hasDistinctMultitouch(); - public boolean isAccessibilityEnabled(); } public final int mPointerId; @@ -70,9 +69,6 @@ public class PointerTracker { private final PointerTrackerKeyState mKeyState; - // true if accessibility is enabled in the parent keyboard - private boolean mIsAccessibilityEnabled; - // true if keyboard layout has been changed. private boolean mKeyboardLayoutHasBeenChanged; @@ -124,7 +120,6 @@ public class PointerTracker { mKeyDetector = keyDetector; mKeyboardSwitcher = KeyboardSwitcher.getInstance(); mKeyState = new PointerTrackerKeyState(keyDetector); - mIsAccessibilityEnabled = proxy.isAccessibilityEnabled(); mHasDistinctMultitouch = proxy.hasDistinctMultitouch(); final Resources res = mKeyboardView.getResources(); mConfigSlidingKeyInputEnabled = res.getBoolean(R.bool.config_sliding_key_input_enabled); @@ -143,10 +138,6 @@ public class PointerTracker { mListener = listener; } - public void setAccessibilityEnabled(boolean accessibilityEnabled) { - mIsAccessibilityEnabled = accessibilityEnabled; - } - // Returns true if keyboard has been changed by this callback. private boolean callListenerOnPressAndCheckKeyboardLayoutChange(Key key, boolean withSliding) { final boolean ignoreModifierKey = mIgnoreModifierKey && isModifierCode(key.mCode); @@ -342,10 +333,9 @@ public class PointerTracker { private void onDownEventInternal(int x, int y, long eventTime) { int keyIndex = mKeyState.onDownKey(x, y, eventTime); // Sliding key is allowed when 1) enabled by configuration, 2) this pointer starts sliding - // from modifier key, 3) this pointer is on mini-keyboard, or 4) accessibility is enabled. + // from modifier key, or 3) this pointer is on mini-keyboard. mIsAllowedSlidingKeyInput = mConfigSlidingKeyInputEnabled || isModifierInternal(keyIndex) - || mKeyDetector instanceof MiniKeyboardKeyDetector - || mIsAccessibilityEnabled; + || mKeyDetector instanceof MiniKeyboardKeyDetector; mKeyboardLayoutHasBeenChanged = false; mKeyAlreadyProcessed = false; mIsRepeatableKey = false; @@ -575,10 +565,8 @@ public class PointerTracker { } private void startRepeatKey(int keyIndex) { - // Accessibility disables key repeat because users may need to pause on a key to hear - // its spoken description. final Key key = getKey(keyIndex); - if (key != null && key.mRepeatable && !mIsAccessibilityEnabled) { + if (key != null && key.mRepeatable) { dismissKeyPreview(); onRepeatKey(keyIndex); mHandler.startKeyRepeatTimer(mDelayBeforeKeyRepeatStart, keyIndex, this); @@ -620,14 +608,11 @@ public class PointerTracker { } } - // The modifier key, such as shift key, should not show its key preview. If accessibility is - // turned on, the modifier key should show its key preview. + // The modifier key, such as shift key, should not show its key preview. private boolean isKeyPreviewNotRequired(int keyIndex) { final Key key = getKey(keyIndex); if (!key.mEnabled) return true; - if (mIsAccessibilityEnabled) - return false; // Such as spacebar sliding language switch. if (mKeyboard.needSpacebarPreview(keyIndex)) return false; @@ -647,11 +632,6 @@ public class PointerTracker { } private void startLongPressTimer(int keyIndex) { - // Accessibility disables long press because users are likely to need to pause on a key - // for an unspecified duration in order to hear the key's spoken description. - if (mIsAccessibilityEnabled) { - return; - } Key key = getKey(keyIndex); if (!key.mEnabled) return; diff --git a/java/src/com/android/inputmethod/latin/AccessibilityUtils.java b/java/src/com/android/inputmethod/latin/AccessibilityUtils.java deleted file mode 100644 index cd3f9e0ad..000000000 --- a/java/src/com/android/inputmethod/latin/AccessibilityUtils.java +++ /dev/null @@ -1,211 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.inputmethod.latin; - -import android.content.Context; -import android.content.SharedPreferences; -import android.content.res.TypedArray; -import android.view.accessibility.AccessibilityEvent; -import android.view.accessibility.AccessibilityManager; - -import com.android.inputmethod.keyboard.Keyboard; -import com.android.inputmethod.keyboard.KeyboardSwitcher; - -import java.util.HashMap; -import java.util.Map; - -/** - * Utility functions for accessibility support. - */ -public class AccessibilityUtils { - /** Shared singleton instance. */ - private static final AccessibilityUtils sInstance = new AccessibilityUtils(); - private /* final */ LatinIME mService; - private /* final */ AccessibilityManager mAccessibilityManager; - private /* final */ Map<Integer, CharSequence> mDescriptions; - - /** - * Returns a shared instance of AccessibilityUtils. - * - * @return A shared instance of AccessibilityUtils. - */ - public static AccessibilityUtils getInstance() { - return sInstance; - } - - /** - * Initializes (or re-initializes) the shared instance of AccessibilityUtils - * with the specified parent service and preferences. - * - * @param service The parent input method service. - * @param prefs The parent preferences. - */ - public static void init(LatinIME service, SharedPreferences prefs) { - sInstance.initialize(service, prefs); - } - - private AccessibilityUtils() { - // This class is not publicly instantiable. - } - - /** - * Initializes (or re-initializes) with the specified parent service and - * preferences. - * - * @param service The parent input method service. - * @param prefs The parent preferences. - */ - private void initialize(LatinIME service, SharedPreferences prefs) { - mService = service; - mAccessibilityManager = (AccessibilityManager) service.getSystemService( - Context.ACCESSIBILITY_SERVICE); - mDescriptions = null; - } - - /** - * Returns true if accessibility is enabled. - * - * @return {@code true} if accessibility is enabled. - */ - public boolean isAccessibilityEnabled() { - return mAccessibilityManager.isEnabled(); - } - - /** - * Speaks a key's action after it has been released. Does not speak letter - * keys since typed keys are already spoken aloud by TalkBack. - * <p> - * No-op if accessibility is not enabled. - * </p> - * - * @param primaryCode The primary code of the released key. - * @param switcher The input method's {@link KeyboardSwitcher}. - */ - public void onRelease(int primaryCode, KeyboardSwitcher switcher) { - if (!isAccessibilityEnabled()) { - return; - } - - int resId = -1; - - switch (primaryCode) { - case Keyboard.CODE_SHIFT: { - if (switcher.isShiftedOrShiftLocked()) { - resId = R.string.description_shift_on; - } else { - resId = R.string.description_shift_off; - } - break; - } - - case Keyboard.CODE_SWITCH_ALPHA_SYMBOL: { - if (switcher.isAlphabetMode()) { - resId = R.string.description_symbols_off; - } else { - resId = R.string.description_symbols_on; - } - break; - } - } - - if (resId >= 0) { - speakDescription(mService.getResources().getText(resId)); - } - } - - /** - * Speaks a key's description for accessibility. If a key has an explicit - * description defined in keycodes.xml, that will be used. Otherwise, if the - * key is a Unicode character, then its character will be used. - * <p> - * No-op if accessibility is not enabled. - * </p> - * - * @param primaryCode The primary code of the pressed key. - * @param switcher The input method's {@link KeyboardSwitcher}. - */ - public void onPress(int primaryCode, KeyboardSwitcher switcher) { - if (!isAccessibilityEnabled()) { - return; - } - - // TODO Use the current keyboard state to read "Switch to symbols" - // instead of just "Symbols" (and similar for shift key). - CharSequence description = describeKey(primaryCode); - if (description == null && Character.isDefined((char) primaryCode)) { - description = Character.toString((char) primaryCode); - } - - if (description != null) { - speakDescription(description); - } - } - - /** - * Returns a text description for a given key code. If the key does not have - * an explicit description, returns <code>null</code>. - * - * @param keyCode An integer key code. - * @return A {@link CharSequence} describing the key or <code>null</code> if - * no description is available. - */ - private CharSequence describeKey(int keyCode) { - // If not loaded yet, load key descriptions from XML file. - if (mDescriptions == null) { - mDescriptions = loadDescriptions(); - } - - return mDescriptions.get(keyCode); - } - - /** - * Loads key descriptions from resources. - */ - private Map<Integer, CharSequence> loadDescriptions() { - final Map<Integer, CharSequence> descriptions = new HashMap<Integer, CharSequence>(); - final TypedArray array = mService.getResources().obtainTypedArray(R.array.key_descriptions); - - // Key descriptions are stored as a key code followed by a string. - for (int i = 0; i < array.length() - 1; i += 2) { - int code = array.getInteger(i, 0); - CharSequence desc = array.getText(i + 1); - - descriptions.put(code, desc); - } - - array.recycle(); - - return descriptions; - } - - /** - * Sends a character sequence to be read aloud. - * - * @param description The {@link CharSequence} to be read aloud. - */ - private void speakDescription(CharSequence description) { - // TODO We need to add an AccessibilityEvent type for IMEs. - final AccessibilityEvent event = AccessibilityEvent.obtain( - AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED); - event.setPackageName(mService.getPackageName()); - event.setClassName(getClass().getName()); - event.setAddedCount(description.length()); - event.getText().add(description); - - mAccessibilityManager.sendAccessibilityEvent(event); - } -} diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 2858b2fb9..2d4d7b989 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -22,7 +22,6 @@ import com.android.inputmethod.compat.InputConnectionCompatUtils; import com.android.inputmethod.compat.InputMethodManagerCompatWrapper; import com.android.inputmethod.compat.InputMethodServiceCompatWrapper; import com.android.inputmethod.compat.InputTypeCompatUtils; -import com.android.inputmethod.compat.VibratorCompatWrapper; import com.android.inputmethod.deprecated.LanguageSwitcherProxy; import com.android.inputmethod.deprecated.VoiceProxy; import com.android.inputmethod.deprecated.recorrection.Recorrection; @@ -74,7 +73,6 @@ import android.widget.LinearLayout; import java.io.FileDescriptor; import java.io.PrintWriter; -import java.util.Arrays; import java.util.Locale; /** @@ -136,6 +134,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar SUGGESTION_VISIBILILTY_HIDE_VALUE }; + private Settings.Values mSettingsValues; + private View mCandidateViewContainer; private int mCandidateStripHeight; private CandidateView mCandidateView; @@ -165,8 +165,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar private boolean mIsSettingsSuggestionStripOn; private boolean mApplicationSpecifiedCompletionOn; - private AccessibilityUtils mAccessibilityUtils; - private final StringBuilder mComposing = new StringBuilder(); private WordComposer mWord = new WordComposer(); private CharSequence mBestWord; @@ -175,26 +173,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar // Magic space: a space that should disappear on space/apostrophe insertion, move after the // punctuation on punctuation insertion, and become a real space on alpha char insertion. private boolean mJustAddedMagicSpace; // This indicates whether the last char is a magic space. - private boolean mAutoCorrectEnabled; - // Suggestion: use bigrams to adjust scores of suggestions obtained from unigram dictionary - private boolean mBigramSuggestionEnabled; - // Prediction: use bigrams to predict the next word when there is no input for it yet - private boolean mBigramPredictionEnabled; - private boolean mAutoCorrectOn; - private boolean mVibrateOn; - private boolean mSoundOn; - private boolean mPopupOn; - private boolean mAutoCap; - private boolean mQuickFixes; - private boolean mConfigEnableShowSubtypeSettings; - private boolean mConfigSwipeDownDismissKeyboardEnabled; - private int mConfigDelayBeforeFadeoutLanguageOnSpacebar; - private int mConfigDelayUpdateSuggestions; - private int mConfigDelayUpdateOldSuggestions; - private int mConfigDelayUpdateShiftState; - private int mConfigDurationOfFadeoutLanguageOnSpacebar; - private float mConfigFinalFadeoutFactorOfLanguageOnSpacebar; - private long mConfigDoubleSpacesTurnIntoPeriodTimeout; private int mCorrectionMode; private int mCommittedLength; @@ -202,7 +180,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar // Keep track of the last selection range to decide if we need to show word alternatives private int mLastSelectionStart; private int mLastSelectionEnd; - private SuggestedWords mSuggestPuncList; // Indicates whether the suggestion strip is to be on in landscape private boolean mJustAccepted; @@ -212,12 +189,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar private AudioManager mAudioManager; // Align sound effect volume on music volume private static final float FX_VOLUME = -1.0f; - private boolean mSilentMode; + private boolean mSilentModeOn; // System-wide current configuration - /* package */ String mWordSeparators; - private String mMagicSpaceStrippers; - private String mMagicSpaceSwappers; - private String mSuggestPuncs; // TODO: Move this flag to VoiceProxy private boolean mConfigurationChanging; @@ -252,7 +225,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar case MSG_UPDATE_OLD_SUGGESTIONS: mRecorrection.setRecorrectionSuggestions(mVoiceProxy, mCandidateView, mSuggest, mKeyboardSwitcher, mWord, mHasUncommittedTypedChars, mLastSelectionStart, - mLastSelectionEnd, mWordSeparators); + mLastSelectionEnd, mSettingsValues.mWordSeparators); break; case MSG_UPDATE_SHIFT_STATE: switcher.updateShiftState(); @@ -265,17 +238,20 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar || (switcher.isAlphabetMode() && switcher.isShiftedOrShiftLocked())); break; case MSG_FADEOUT_LANGUAGE_ON_SPACEBAR: - if (inputView != null) + if (inputView != null) { inputView.setSpacebarTextFadeFactor( - (1.0f + mConfigFinalFadeoutFactorOfLanguageOnSpacebar) / 2, + (1.0f + mSettingsValues.mFinalFadeoutFactorOfLanguageOnSpacebar) / 2, (LatinKeyboard)msg.obj); + } sendMessageDelayed(obtainMessage(MSG_DISMISS_LANGUAGE_ON_SPACEBAR, msg.obj), - mConfigDurationOfFadeoutLanguageOnSpacebar); + mSettingsValues.mDurationOfFadeoutLanguageOnSpacebar); break; case MSG_DISMISS_LANGUAGE_ON_SPACEBAR: - if (inputView != null) + if (inputView != null) { inputView.setSpacebarTextFadeFactor( - mConfigFinalFadeoutFactorOfLanguageOnSpacebar, (LatinKeyboard)msg.obj); + mSettingsValues.mFinalFadeoutFactorOfLanguageOnSpacebar, + (LatinKeyboard)msg.obj); + } break; } } @@ -283,7 +259,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar public void postUpdateSuggestions() { removeMessages(MSG_UPDATE_SUGGESTIONS); sendMessageDelayed(obtainMessage(MSG_UPDATE_SUGGESTIONS), - mConfigDelayUpdateSuggestions); + mSettingsValues.mDelayUpdateSuggestions); } public void cancelUpdateSuggestions() { @@ -297,7 +273,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar public void postUpdateOldSuggestions() { removeMessages(MSG_UPDATE_OLD_SUGGESTIONS); sendMessageDelayed(obtainMessage(MSG_UPDATE_OLD_SUGGESTIONS), - mConfigDelayUpdateOldSuggestions); + mSettingsValues.mDelayUpdateOldSuggestions); } public void cancelUpdateOldSuggestions() { @@ -306,7 +282,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar public void postUpdateShiftKeyState() { removeMessages(MSG_UPDATE_SHIFT_STATE); - sendMessageDelayed(obtainMessage(MSG_UPDATE_SHIFT_STATE), mConfigDelayUpdateShiftState); + sendMessageDelayed(obtainMessage(MSG_UPDATE_SHIFT_STATE), + mSettingsValues.mDelayUpdateShiftState); } public void cancelUpdateShiftState() { @@ -316,7 +293,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar public void postUpdateBigramPredictions() { removeMessages(MSG_SET_BIGRAM_PREDICTIONS); sendMessageDelayed(obtainMessage(MSG_SET_BIGRAM_PREDICTIONS), - mConfigDelayUpdateSuggestions); + mSettingsValues.mDelayUpdateSuggestions); } public void cancelUpdateBigramPredictions() { @@ -335,15 +312,16 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar final LatinKeyboard keyboard = mKeyboardSwitcher.getLatinKeyboard(); // The language is always displayed when the delay is negative. final boolean needsToDisplayLanguage = localeChanged - || mConfigDelayBeforeFadeoutLanguageOnSpacebar < 0; + || mSettingsValues.mDelayBeforeFadeoutLanguageOnSpacebar < 0; // The language is never displayed when the delay is zero. - if (mConfigDelayBeforeFadeoutLanguageOnSpacebar != 0) + if (mSettingsValues.mDelayBeforeFadeoutLanguageOnSpacebar != 0) { inputView.setSpacebarTextFadeFactor(needsToDisplayLanguage ? 1.0f - : mConfigFinalFadeoutFactorOfLanguageOnSpacebar, keyboard); + : mSettingsValues.mFinalFadeoutFactorOfLanguageOnSpacebar, keyboard); + } // The fadeout animation will start when the delay is positive. - if (localeChanged && mConfigDelayBeforeFadeoutLanguageOnSpacebar > 0) { + if (localeChanged && mSettingsValues.mDelayBeforeFadeoutLanguageOnSpacebar > 0) { sendMessageDelayed(obtainMessage(MSG_FADEOUT_LANGUAGE_ON_SPACEBAR, keyboard), - mConfigDelayBeforeFadeoutLanguageOnSpacebar); + mSettingsValues.mDelayBeforeFadeoutLanguageOnSpacebar); } } } @@ -351,7 +329,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar public void startDoubleSpacesTimer() { removeMessages(MSG_SPACE_TYPED); sendMessageDelayed(obtainMessage(MSG_SPACE_TYPED), - mConfigDoubleSpacesTurnIntoPeriodTimeout); + mSettingsValues.mDoubleSpacesTurnIntoPeriodTimeout); } public void cancelDoubleSpacesTimer() { @@ -371,7 +349,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar LanguageSwitcherProxy.init(this, prefs); SubtypeSwitcher.init(this, prefs); KeyboardSwitcher.init(this, prefs); - AccessibilityUtils.init(this, prefs); Recorrection.init(this, prefs); super.onCreate(); @@ -380,29 +357,13 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar mInputMethodId = Utils.getInputMethodId(mImm, getPackageName()); mSubtypeSwitcher = SubtypeSwitcher.getInstance(); mKeyboardSwitcher = KeyboardSwitcher.getInstance(); - mAccessibilityUtils = AccessibilityUtils.getInstance(); mRecorrection = Recorrection.getInstance(); + loadSettings(); + final Resources res = getResources(); mResources = res; - mConfigEnableShowSubtypeSettings = res.getBoolean( - R.bool.config_enable_show_subtype_settings); - mConfigSwipeDownDismissKeyboardEnabled = res.getBoolean( - R.bool.config_swipe_down_dismiss_keyboard_enabled); - mConfigDelayBeforeFadeoutLanguageOnSpacebar = res.getInteger( - R.integer.config_delay_before_fadeout_language_on_spacebar); - mConfigDelayUpdateSuggestions = res.getInteger(R.integer.config_delay_update_suggestions); - mConfigDelayUpdateOldSuggestions = res.getInteger( - R.integer.config_delay_update_old_suggestions); - mConfigDelayUpdateShiftState = res.getInteger(R.integer.config_delay_update_shift_state); - mConfigDurationOfFadeoutLanguageOnSpacebar = res.getInteger( - R.integer.config_duration_of_fadeout_language_on_spacebar); - mConfigFinalFadeoutFactorOfLanguageOnSpacebar = res.getInteger( - R.integer.config_final_fadeout_percentage_of_language_on_spacebar) / 100.0f; - mConfigDoubleSpacesTurnIntoPeriodTimeout = res.getInteger( - R.integer.config_double_spaces_turn_into_period_timeout); - Utils.GCUtils.getInstance().reset(); boolean tryGC = true; for (int i = 0; i < Utils.GCUtils.GC_TRY_LOOP_MAX && tryGC; ++i) { @@ -415,7 +376,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } mOrientation = res.getConfiguration().orientation; - initSuggestPuncList(); // Register to receive ringer mode change and network state change. // Also receive installation and removal of a dictionary pack. @@ -437,6 +397,13 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar registerReceiver(mDictionaryPackInstallReceiver, newDictFilter); } + // Has to be package-visible for unit tests + /* package */ void loadSettings() { + if (null == mPrefs) mPrefs = PreferenceManager.getDefaultSharedPreferences(this); + if (null == mSubtypeSwitcher) mSubtypeSwitcher = SubtypeSwitcher.getInstance(); + mSettingsValues = new Settings.Values(mPrefs, this, mSubtypeSwitcher.getInputLocaleStr()); + } + private void initSuggest() { final String localeStr = mSubtypeSwitcher.getInputLocaleStr(); final Locale keyboardLocale = new Locale(localeStr); @@ -446,12 +413,12 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar if (mSuggest != null) { mSuggest.close(); } - final SharedPreferences prefs = mPrefs; - mQuickFixes = isQuickFixesEnabled(prefs); int mainDicResId = Utils.getMainDictionaryResourceId(res); mSuggest = new Suggest(this, mainDicResId, keyboardLocale); - loadAndSetAutoCorrectionThreshold(prefs); + if (mSettingsValues.mAutoCorrectEnabled) { + mSuggest.setAutoCorrectionThreshold(mSettingsValues.mAutoCorrectionThreshold); + } updateAutoTextEnabled(); mUserDictionary = new UserDictionary(this, localeStr); @@ -467,14 +434,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar mSuggest.setUserBigramDictionary(mUserBigramDictionary); updateCorrectionMode(); - mMagicSpaceStrippers = res.getString(R.string.magic_space_stripping_symbols); - mMagicSpaceSwappers = res.getString(R.string.magic_space_swapping_symbols); - String wordSeparators = mMagicSpaceStrippers + mMagicSpaceSwappers - + res.getString(R.string.magic_space_promoting_symbols); - final String notWordSeparators = res.getString(R.string.non_word_separator_symbols); - for (int i = notWordSeparators.length() - 1; i >= 0; --i) - wordSeparators = wordSeparators.replace(notWordSeparators.substring(i, i + 1), ""); - mWordSeparators = wordSeparators; Utils.setSystemLocale(res, savedLocale); } @@ -572,7 +531,18 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar mDeleteCount = 0; mJustAddedMagicSpace = false; - loadSettings(attribute); + loadSettings(); + updateCorrectionMode(); + updateAutoTextEnabled(); + updateSuggestionVisibility(mPrefs, mResources); + + if (mSuggest != null && mSettingsValues.mAutoCorrectEnabled) { + mSuggest.setAutoCorrectionThreshold(mSettingsValues.mAutoCorrectionThreshold); + } + mVoiceProxy.loadSettings(attribute, mPrefs); + // This will work only when the subtype is not supported. + LanguageSwitcherProxy.loadSettings(); + if (mSubtypeSwitcher.isKeyboardMode()) { switcher.loadKeyboard(attribute, mSubtypeSwitcher.isShortcutImeEnabled() && voiceIme.isVoiceButtonEnabled(), @@ -586,11 +556,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar updateCorrectionMode(); - final boolean accessibilityEnabled = mAccessibilityUtils.isAccessibilityEnabled(); - - inputView.setKeyPreviewEnabled(mPopupOn); + inputView.setKeyPreviewEnabled(mSettingsValues.mPopupOn); inputView.setProximityCorrectionEnabled(true); - inputView.setAccessibilityEnabled(accessibilityEnabled); // If we just entered a text field, maybe it has some old text that requires correction mRecorrection.checkRecorrectionOnStart(); inputView.setForeground(true); @@ -954,7 +921,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar public boolean getCurrentAutoCapsState() { InputConnection ic = getCurrentInputConnection(); EditorInfo ei = getCurrentInputEditorInfo(); - if (mAutoCap && ic != null && ei != null && ei.inputType != InputType.TYPE_NULL) { + if (mSettingsValues.mAutoCap && ic != null && ei != null + && ei.inputType != InputType.TYPE_NULL) { return ic.getCursorCapsMode(ei.inputType) != 0; } return false; @@ -1039,7 +1007,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar private void onSettingsKeyPressed() { if (!isShowingOptionDialog()) { - if (!mConfigEnableShowSubtypeSettings) { + if (!mSettingsValues.mEnableShowSubtypeSettings) { showSubtypeSelectorAndSettings(); } else if (Utils.hasMultipleEnabledIMEsOrSubtypes(mImm)) { showOptionsMenu(); @@ -1072,7 +1040,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } mLastKeyTime = when; KeyboardSwitcher switcher = mKeyboardSwitcher; - final boolean accessibilityEnabled = switcher.isAccessibilityEnabled(); final boolean distinctMultiTouch = switcher.hasDistinctMultitouch(); switch (primaryCode) { case Keyboard.CODE_DELETE: @@ -1082,12 +1049,12 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar break; case Keyboard.CODE_SHIFT: // Shift key is handled in onPress() when device has distinct multi-touch panel. - if (!distinctMultiTouch || accessibilityEnabled) + if (!distinctMultiTouch) switcher.toggleShift(); break; case Keyboard.CODE_SWITCH_ALPHA_SYMBOL: // Symbol key is handled in onPress() when device has distinct multi-touch panel. - if (!distinctMultiTouch || accessibilityEnabled) + if (!distinctMultiTouch) switcher.changeKeyboardMode(); break; case Keyboard.CODE_CANCEL: @@ -1117,7 +1084,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar handleTab(); break; default: - if (isWordSeparator(primaryCode)) { + if (mSettingsValues.isWordSeparator(primaryCode)) { handleSeparator(primaryCode, x, y); } else { handleCharacter(primaryCode, keyCodes, x, y); @@ -1242,7 +1209,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar private void handleCharacter(int primaryCode, int[] keyCodes, int x, int y) { mVoiceProxy.handleCharacter(); - if (mJustAddedMagicSpace && isMagicSpaceStripper(primaryCode)) { + if (mJustAddedMagicSpace && mSettingsValues.isMagicSpaceStripper(primaryCode)) { removeTrailingSpace(); } @@ -1298,7 +1265,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } else { sendKeyChar((char)code); } - if (mJustAddedMagicSpace && isMagicSpaceSwapper(primaryCode)) { + if (mJustAddedMagicSpace && mSettingsValues.isMagicSpaceSwapper(primaryCode)) { swapSwapperAndSpace(); } else { mJustAddedMagicSpace = false; @@ -1306,7 +1273,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar switcher.updateShiftState(); if (LatinIME.PERF_DEBUG) measureCps(); - TextEntryState.typedCharacter((char) code, isWordSeparator(code), x, y); + TextEntryState.typedCharacter((char) code, mSettingsValues.isWordSeparator(code), x, y); } private void handleSeparator(int primaryCode, int x, int y) { @@ -1330,7 +1297,10 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar // not to auto correct, but accept the typed word. For instance, // in Italian dov' should not be expanded to dove' because the elision // requires the last vowel to be removed. - if (mAutoCorrectOn && primaryCode != Keyboard.CODE_SINGLE_QUOTE) { + final boolean shouldAutoCorrect = + (mSettingsValues.mAutoCorrectEnabled || mSettingsValues.mQuickFixes) + && !mInputTypeNoAutoCorrect && mHasDictionary; + if (shouldAutoCorrect && primaryCode != Keyboard.CODE_SINGLE_QUOTE) { pickedDefault = pickDefaultSuggestion(primaryCode); } else { commitTyped(ic); @@ -1338,11 +1308,11 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } if (mJustAddedMagicSpace) { - if (isMagicSpaceSwapper(primaryCode)) { + if (mSettingsValues.isMagicSpaceSwapper(primaryCode)) { sendKeyChar((char)primaryCode); swapSwapperAndSpace(); } else { - if (isMagicSpaceStripper(primaryCode)) removeTrailingSpace(); + if (mSettingsValues.isMagicSpaceStripper(primaryCode)) removeTrailingSpace(); sendKeyChar((char)primaryCode); mJustAddedMagicSpace = false; } @@ -1398,7 +1368,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } public boolean isShowingPunctuationList() { - return mSuggestPuncList == mCandidateView.getSuggestions(); + return mSettingsValues.mSuggestPuncList == mCandidateView.getSuggestions(); } public boolean isShowingSuggestionsStrip() { @@ -1472,7 +1442,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar private void showSuggestions(WordComposer word) { // TODO: May need a better way of retrieving previous word CharSequence prevWord = EditingUtils.getPreviousWord(getCurrentInputConnection(), - mWordSeparators); + mSettingsValues.mWordSeparators); SuggestedWords.Builder builder = mSuggest.getSuggestedWordBuilder( mKeyboardSwitcher.getInputView(), word, prevWord); @@ -1500,7 +1470,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar builder.setTypedWordValid(typedWordValid).setHasMinimalSuggestion(correctionAvailable); } else { final SuggestedWords previousSuggestions = mCandidateView.getSuggestions(); - if (previousSuggestions == mSuggestPuncList) + if (previousSuggestions == mSettingsValues.mSuggestPuncList) return; builder.addTypedWordAndPreviousSuggestions(typedWord, previousSuggestions); } @@ -1536,14 +1506,14 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar // Add the word to the auto dictionary if it's not a known word addToAutoAndUserBigramDictionaries(mBestWord, AutoDictionary.FREQUENCY_FOR_TYPED); return true; - } return false; } public void pickSuggestionManually(int index, CharSequence suggestion) { SuggestedWords suggestions = mCandidateView.getSuggestions(); - mVoiceProxy.flushAndLogAllTextModificationCounters(index, suggestion, mWordSeparators); + mVoiceProxy.flushAndLogAllTextModificationCounters(index, suggestion, + mSettingsValues.mWordSeparators); final boolean recorrecting = TextEntryState.isRecorrecting(); InputConnection ic = getCurrentInputConnection(); @@ -1568,8 +1538,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } // If this is a punctuation, apply it through the normal key press - if (suggestion.length() == 1 && (isWordSeparator(suggestion.charAt(0)) - || isSuggestedPunctuation(suggestion.charAt(0)))) { + if (suggestion.length() == 1 && (mSettingsValues.isWordSeparator(suggestion.charAt(0)) + || mSettingsValues.isSuggestedPunctuation(suggestion.charAt(0)))) { // Word separators are suggested before the user inputs something. // So, LatinImeLogger logs "" as a user's input. LatinImeLogger.logOnManualSuggestion( @@ -1633,7 +1603,10 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar // TextEntryState.State.PICKED_SUGGESTION state. TextEntryState.typedCharacter((char) Keyboard.CODE_SPACE, true, WordComposer.NOT_A_COORDINATE, WordComposer.NOT_A_COORDINATE); - // From there on onUpdateSelection() will fire so suggestions will be updated + // On Honeycomb+, onUpdateSelection() will fire, but in Gingerbread- in WebTextView + // only it does not, for some reason. Force update suggestions so that it works + // in Gingerbread- in WebTextView too. + mHandler.postUpdateSuggestions(); } else if (!showingAddToDictionaryHint) { // If we're not showing the "Touch again to save", then show corrections again. // In case the cursor position doesn't change, make sure we show the suggestions again. @@ -1660,7 +1633,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar return; InputConnection ic = getCurrentInputConnection(); if (ic != null) { - mVoiceProxy.rememberReplacedWord(suggestion, mWordSeparators); + mVoiceProxy.rememberReplacedWord(suggestion, mSettingsValues.mWordSeparators); ic.commitText(suggestion, 1); } mRecorrection.saveRecorrectionSuggestion(mWord, suggestion); @@ -1673,13 +1646,13 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar if (mSuggest == null || !isSuggestionsRequested()) return; - if (!mBigramPredictionEnabled) { + if (!mSettingsValues.mBigramPredictionEnabled) { setPunctuationSuggestions(); return; } final CharSequence prevWord = EditingUtils.getThisWord(getCurrentInputConnection(), - mWordSeparators); + mSettingsValues.mWordSeparators); SuggestedWords.Builder builder = mSuggest.getSuggestedWordBuilder( mKeyboardSwitcher.getInputView(), sEmptyWordComposer, prevWord); @@ -1693,7 +1666,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } public void setPunctuationSuggestions() { - setSuggestions(mSuggestPuncList); + setSuggestions(mSettingsValues.mSuggestPuncList); setCandidatesViewShown(isCandidateStripVisible()); } @@ -1736,7 +1709,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar // For example "I will, and you too" : we don't want the pair ("will" "and") to be // a bigram. CharSequence prevWord = EditingUtils.getPreviousWord(getCurrentInputConnection(), - mWordSeparators); + mSettingsValues.mWordSeparators); if (!TextUtils.isEmpty(prevWord)) { mUserBigramDictionary.addBigrams(prevWord.toString(), suggestion.toString()); } @@ -1749,13 +1722,13 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar CharSequence toLeft = ic.getTextBeforeCursor(1, 0); CharSequence toRight = ic.getTextAfterCursor(1, 0); if (!TextUtils.isEmpty(toLeft) - && !isWordSeparator(toLeft.charAt(0)) - && !isSuggestedPunctuation(toLeft.charAt(0))) { + && !mSettingsValues.isWordSeparator(toLeft.charAt(0)) + && !mSettingsValues.isSuggestedPunctuation(toLeft.charAt(0))) { return true; } if (!TextUtils.isEmpty(toRight) - && !isWordSeparator(toRight.charAt(0)) - && !isSuggestedPunctuation(toRight.charAt(0))) { + && !mSettingsValues.isWordSeparator(toRight.charAt(0)) + && !mSettingsValues.isSuggestedPunctuation(toRight.charAt(0))) { return true; } return false; @@ -1774,14 +1747,16 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar if (deleteChar) ic.deleteSurroundingText(1, 0); int toDelete = mCommittedLength; final CharSequence toTheLeft = ic.getTextBeforeCursor(mCommittedLength, 0); - if (!TextUtils.isEmpty(toTheLeft) && isWordSeparator(toTheLeft.charAt(0))) { + if (!TextUtils.isEmpty(toTheLeft) + && mSettingsValues.isWordSeparator(toTheLeft.charAt(0))) { toDelete--; } ic.deleteSurroundingText(toDelete, 0); // Re-insert punctuation only when the deleted character was word separator and the // composing text wasn't equal to the auto-corrected text. if (deleteChar - && !TextUtils.isEmpty(punctuation) && isWordSeparator(punctuation.charAt(0)) + && !TextUtils.isEmpty(punctuation) + && mSettingsValues.isWordSeparator(punctuation.charAt(0)) && !TextUtils.equals(mComposing, toTheLeft)) { ic.commitText(mComposing, 1); TextEntryState.acceptedTyped(mComposing); @@ -1802,21 +1777,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } } - protected String getWordSeparators() { - return mWordSeparators; - } - public boolean isWordSeparator(int code) { - String separators = getWordSeparators(); - return separators.contains(String.valueOf((char)code)); - } - - private boolean isMagicSpaceStripper(int code) { - return mMagicSpaceStrippers.contains(String.valueOf((char)code)); - } - - private boolean isMagicSpaceSwapper(int code) { - return mMagicSpaceSwappers.contains(String.valueOf((char)code)); + return mSettingsValues.isWordSeparator(code); } private void sendMagicSpace() { @@ -1837,6 +1799,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar mSubtypeSwitcher.isShortcutImeEnabled() && mVoiceProxy.isVoiceButtonEnabled(), mVoiceProxy.isVoiceButtonOnPrimary()); initSuggest(); + loadSettings(); mKeyboardSwitcher.updateShiftState(); } @@ -1845,12 +1808,14 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar if (mSubtypeSwitcher.useSpacebarLanguageSwitcher()) { mSubtypeSwitcher.toggleLanguage(next); } - onRefreshKeyboard();// no need?? - } + // The following is necessary because on API levels < 10, we don't get notified when + // subtype changes. + onRefreshKeyboard(); + } @Override public void onSwipeDown() { - if (mConfigSwipeDownDismissKeyboardEnabled) + if (mSettingsValues.mSwipeDownDismissKeyboardEnabled) handleClose(); } @@ -1869,7 +1834,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } else { switcher.onOtherKeyPressed(); } - mAccessibilityUtils.onPress(primaryCode, switcher); } @Override @@ -1882,7 +1846,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } else if (distinctMultiTouch && primaryCode == Keyboard.CODE_SWITCH_ALPHA_SYMBOL) { switcher.onReleaseSymbol(); } - mAccessibilityUtils.onRelease(primaryCode, switcher); } @@ -1905,7 +1868,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); } if (mAudioManager != null) { - mSilentMode = (mAudioManager.getRingerMode() != AudioManager.RINGER_MODE_NORMAL); + mSilentModeOn = (mAudioManager.getRingerMode() != AudioManager.RINGER_MODE_NORMAL); } } @@ -1917,7 +1880,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar updateRingerMode(); } } - if (mSoundOn && !mSilentMode) { + if (isSoundOn()) { // FIXME: Volume and enable should come from UI settings // FIXME: These should be triggered after auto-repeat logic int sound = AudioManager.FX_KEYPRESS_STANDARD; @@ -1937,7 +1900,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } public void vibrate() { - if (!mVibrateOn) { + if (!mSettingsValues.mVibrateOn) { return; } LatinKeyboardView inputView = mKeyboardSwitcher.getInputView(); @@ -1958,18 +1921,22 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } public boolean getPopupOn() { - return mPopupOn; + return mSettingsValues.mPopupOn; + } + boolean isSoundOn() { + return mSettingsValues.mSoundOn && !mSilentModeOn; } private void updateCorrectionMode() { // TODO: cleanup messy flags mHasDictionary = mSuggest != null ? mSuggest.hasMainDictionary() : false; - mAutoCorrectOn = (mAutoCorrectEnabled || mQuickFixes) - && !mInputTypeNoAutoCorrect && mHasDictionary; - mCorrectionMode = (mAutoCorrectOn && mAutoCorrectEnabled) + final boolean shouldAutoCorrect = (mSettingsValues.mAutoCorrectEnabled + || mSettingsValues.mQuickFixes) && !mInputTypeNoAutoCorrect && mHasDictionary; + mCorrectionMode = (shouldAutoCorrect && mSettingsValues.mAutoCorrectEnabled) ? Suggest.CORRECTION_FULL - : (mAutoCorrectOn ? Suggest.CORRECTION_BASIC : Suggest.CORRECTION_NONE); - mCorrectionMode = (mBigramSuggestionEnabled && mAutoCorrectOn && mAutoCorrectEnabled) + : (shouldAutoCorrect ? Suggest.CORRECTION_BASIC : Suggest.CORRECTION_NONE); + mCorrectionMode = (mSettingsValues.mBigramSuggestionEnabled && shouldAutoCorrect + && mSettingsValues.mAutoCorrectEnabled) ? Suggest.CORRECTION_FULL_BIGRAM : mCorrectionMode; if (mSuggest != null) { mSuggest.setCorrectionMode(mCorrectionMode); @@ -1978,12 +1945,11 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar private void updateAutoTextEnabled() { if (mSuggest == null) return; - mSuggest.setQuickFixesEnabled(mQuickFixes + mSuggest.setQuickFixesEnabled(mSettingsValues.mQuickFixes && SubtypeSwitcher.getInstance().isSystemLanguageSameAsInputLanguage()); } - private void updateSuggestionVisibility(SharedPreferences prefs) { - final Resources res = mResources; + private void updateSuggestionVisibility(final SharedPreferences prefs, final Resources res) { final String suggestionVisiblityStr = prefs.getString( Settings.PREF_SHOW_SUGGESTIONS_SETTING, res.getString(R.string.prefs_suggestion_visibility_default_value)); @@ -2011,128 +1977,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar startActivity(intent); } - private void loadSettings(EditorInfo attribute) { - // Get the settings preferences - final SharedPreferences prefs = mPrefs; - final boolean hasVibrator = VibratorCompatWrapper.getInstance(this).hasVibrator(); - mVibrateOn = hasVibrator && prefs.getBoolean(Settings.PREF_VIBRATE_ON, false); - mSoundOn = prefs.getBoolean(Settings.PREF_SOUND_ON, - mResources.getBoolean(R.bool.config_default_sound_enabled)); - - mPopupOn = isPopupEnabled(prefs); - mAutoCap = prefs.getBoolean(Settings.PREF_AUTO_CAP, true); - mQuickFixes = isQuickFixesEnabled(prefs); - - mAutoCorrectEnabled = isAutoCorrectEnabled(prefs); - mBigramSuggestionEnabled = mAutoCorrectEnabled && isBigramSuggestionEnabled(prefs); - mBigramPredictionEnabled = mBigramSuggestionEnabled && isBigramPredictionEnabled(prefs); - loadAndSetAutoCorrectionThreshold(prefs); - - mVoiceProxy.loadSettings(attribute, prefs); - - updateCorrectionMode(); - updateAutoTextEnabled(); - updateSuggestionVisibility(prefs); - - // This will work only when the subtype is not supported. - LanguageSwitcherProxy.loadSettings(); - } - - /** - * Load Auto correction threshold from SharedPreferences, and modify mSuggest's threshold. - */ - private void loadAndSetAutoCorrectionThreshold(SharedPreferences sp) { - // When mSuggest is not initialized, cannnot modify mSuggest's threshold. - if (mSuggest == null) return; - // When auto correction setting is turned off, the threshold is ignored. - if (!isAutoCorrectEnabled(sp)) return; - - final String currentAutoCorrectionSetting = sp.getString( - Settings.PREF_AUTO_CORRECTION_THRESHOLD, - mResources.getString(R.string.auto_correction_threshold_mode_index_modest)); - final String[] autoCorrectionThresholdValues = mResources.getStringArray( - R.array.auto_correction_threshold_values); - // When autoCrrectionThreshold is greater than 1.0, auto correction is virtually turned off. - double autoCorrectionThreshold = Double.MAX_VALUE; - try { - final int arrayIndex = Integer.valueOf(currentAutoCorrectionSetting); - if (arrayIndex >= 0 && arrayIndex < autoCorrectionThresholdValues.length) { - autoCorrectionThreshold = Double.parseDouble( - autoCorrectionThresholdValues[arrayIndex]); - } - } catch (NumberFormatException e) { - // Whenever the threshold settings are correct, never come here. - autoCorrectionThreshold = Double.MAX_VALUE; - Log.w(TAG, "Cannot load auto correction threshold setting." - + " currentAutoCorrectionSetting: " + currentAutoCorrectionSetting - + ", autoCorrectionThresholdValues: " - + Arrays.toString(autoCorrectionThresholdValues)); - } - // TODO: This should be refactored : - // setAutoCorrectionThreshold should be called outside of this method. - mSuggest.setAutoCorrectionThreshold(autoCorrectionThreshold); - } - - private boolean isPopupEnabled(SharedPreferences sp) { - final boolean showPopupOption = getResources().getBoolean( - R.bool.config_enable_show_popup_on_keypress_option); - if (!showPopupOption) return mResources.getBoolean(R.bool.config_default_popup_preview); - return sp.getBoolean(Settings.PREF_POPUP_ON, - mResources.getBoolean(R.bool.config_default_popup_preview)); - } - - private boolean isQuickFixesEnabled(SharedPreferences sp) { - final boolean showQuickFixesOption = mResources.getBoolean( - R.bool.config_enable_quick_fixes_option); - if (!showQuickFixesOption) { - return isAutoCorrectEnabled(sp); - } - return sp.getBoolean(Settings.PREF_QUICK_FIXES, mResources.getBoolean( - R.bool.config_default_quick_fixes)); - } - - private boolean isAutoCorrectEnabled(SharedPreferences sp) { - final String currentAutoCorrectionSetting = sp.getString( - Settings.PREF_AUTO_CORRECTION_THRESHOLD, - mResources.getString(R.string.auto_correction_threshold_mode_index_modest)); - final String autoCorrectionOff = mResources.getString( - R.string.auto_correction_threshold_mode_index_off); - return !currentAutoCorrectionSetting.equals(autoCorrectionOff); - } - - private boolean isBigramSuggestionEnabled(SharedPreferences sp) { - final boolean showBigramSuggestionsOption = mResources.getBoolean( - R.bool.config_enable_bigram_suggestions_option); - if (!showBigramSuggestionsOption) { - return isAutoCorrectEnabled(sp); - } - return sp.getBoolean(Settings.PREF_BIGRAM_SUGGESTIONS, mResources.getBoolean( - R.bool.config_default_bigram_suggestions)); - } - - private boolean isBigramPredictionEnabled(SharedPreferences sp) { - return sp.getBoolean(Settings.PREF_BIGRAM_PREDICTIONS, mResources.getBoolean( - R.bool.config_default_bigram_prediction)); - } - - private void initSuggestPuncList() { - if (mSuggestPuncs != null || mSuggestPuncList != null) - return; - SuggestedWords.Builder builder = new SuggestedWords.Builder(); - String puncs = mResources.getString(R.string.suggested_punctuations); - if (puncs != null) { - for (int i = 0; i < puncs.length(); i++) { - builder.addWord(puncs.subSequence(i, i + 1)); - } - } - mSuggestPuncList = builder.build(); - mSuggestPuncs = puncs; - } - - private boolean isSuggestedPunctuation(int code) { - return mSuggestPuncs.contains(String.valueOf((char)code)); - } - private void showSubtypeSelectorAndSettings() { final CharSequence title = getString(R.string.english_ime_input_options); final CharSequence[] items = new CharSequence[] { @@ -2216,13 +2060,13 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar p.println(" mIsSuggestionsRequested=" + mIsSettingsSuggestionStripOn); p.println(" mCorrectionMode=" + mCorrectionMode); p.println(" mHasUncommittedTypedChars=" + mHasUncommittedTypedChars); - p.println(" mAutoCorrectOn=" + mAutoCorrectOn); + p.println(" mAutoCorrectEnabled=" + mSettingsValues.mAutoCorrectEnabled); p.println(" mShouldInsertMagicSpace=" + mShouldInsertMagicSpace); p.println(" mApplicationSpecifiedCompletionOn=" + mApplicationSpecifiedCompletionOn); p.println(" TextEntryState.state=" + TextEntryState.getState()); - p.println(" mSoundOn=" + mSoundOn); - p.println(" mVibrateOn=" + mVibrateOn); - p.println(" mPopupOn=" + mPopupOn); + p.println(" mSoundOn=" + mSettingsValues.mSoundOn); + p.println(" mVibrateOn=" + mSettingsValues.mVibrateOn); + p.println(" mPopupOn=" + mSettingsValues.mPopupOn); } // Characters per second measurement diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 42b0fadc2..8953731a5 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -25,9 +25,11 @@ import com.android.inputmethod.compat.VibratorCompatWrapper; import android.app.AlertDialog; import android.app.Dialog; import android.app.backup.BackupManager; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Resources; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.ListPreference; @@ -43,6 +45,7 @@ import android.text.method.LinkMovementMethod; import android.util.Log; import android.widget.TextView; +import java.util.Arrays; import java.util.Locale; public class Settings extends PreferenceActivity @@ -79,6 +82,192 @@ public class Settings extends PreferenceActivity // Dialog ids private static final int VOICE_INPUT_CONFIRM_DIALOG = 0; + public static class Values { + // From resources: + public final boolean mEnableShowSubtypeSettings; + public final boolean mSwipeDownDismissKeyboardEnabled; + public final int mDelayBeforeFadeoutLanguageOnSpacebar; + public final int mDelayUpdateSuggestions; + public final int mDelayUpdateOldSuggestions; + public final int mDelayUpdateShiftState; + public final int mDurationOfFadeoutLanguageOnSpacebar; + public final float mFinalFadeoutFactorOfLanguageOnSpacebar; + public final long mDoubleSpacesTurnIntoPeriodTimeout; + public final String mWordSeparators; + public final String mMagicSpaceStrippers; + public final String mMagicSpaceSwappers; + public final String mSuggestPuncs; + public final SuggestedWords mSuggestPuncList; + + // From preferences: + public final boolean mSoundOn; // Sound setting private to Latin IME (see mSilentModeOn) + public final boolean mVibrateOn; + public final boolean mPopupOn; // Warning : this escapes through LatinIME#isPopupOn + public final boolean mAutoCap; + public final boolean mQuickFixes; + public final boolean mAutoCorrectEnabled; + public final double mAutoCorrectionThreshold; + // Suggestion: use bigrams to adjust scores of suggestions obtained from unigram dictionary + public final boolean mBigramSuggestionEnabled; + // Prediction: use bigrams to predict the next word when there is no input for it yet + public final boolean mBigramPredictionEnabled; + + public Values(final SharedPreferences prefs, final Context context, + final String localeStr) { + final Resources res = context.getResources(); + final Locale savedLocale; + if (null != localeStr) { + final Locale keyboardLocale = new Locale(localeStr); + savedLocale = Utils.setSystemLocale(res, keyboardLocale); + } else { + savedLocale = null; + } + + // Get the resources + mEnableShowSubtypeSettings = res.getBoolean( + R.bool.config_enable_show_subtype_settings); + mSwipeDownDismissKeyboardEnabled = res.getBoolean( + R.bool.config_swipe_down_dismiss_keyboard_enabled); + mDelayBeforeFadeoutLanguageOnSpacebar = res.getInteger( + R.integer.config_delay_before_fadeout_language_on_spacebar); + mDelayUpdateSuggestions = + res.getInteger(R.integer.config_delay_update_suggestions); + mDelayUpdateOldSuggestions = res.getInteger( + R.integer.config_delay_update_old_suggestions); + mDelayUpdateShiftState = + res.getInteger(R.integer.config_delay_update_shift_state); + mDurationOfFadeoutLanguageOnSpacebar = res.getInteger( + R.integer.config_duration_of_fadeout_language_on_spacebar); + mFinalFadeoutFactorOfLanguageOnSpacebar = res.getInteger( + R.integer.config_final_fadeout_percentage_of_language_on_spacebar) / 100.0f; + mDoubleSpacesTurnIntoPeriodTimeout = res.getInteger( + R.integer.config_double_spaces_turn_into_period_timeout); + mMagicSpaceStrippers = res.getString(R.string.magic_space_stripping_symbols); + mMagicSpaceSwappers = res.getString(R.string.magic_space_swapping_symbols); + String wordSeparators = mMagicSpaceStrippers + mMagicSpaceSwappers + + res.getString(R.string.magic_space_promoting_symbols); + final String notWordSeparators = res.getString(R.string.non_word_separator_symbols); + for (int i = notWordSeparators.length() - 1; i >= 0; --i) { + wordSeparators = wordSeparators.replace(notWordSeparators.substring(i, i + 1), ""); + } + mWordSeparators = wordSeparators; + mSuggestPuncs = res.getString(R.string.suggested_punctuations); + // TODO: it would be nice not to recreate this each time we change the configuration + mSuggestPuncList = createSuggestPuncList(mSuggestPuncs); + + // Get the settings preferences + final boolean hasVibrator = VibratorCompatWrapper.getInstance(context).hasVibrator(); + mVibrateOn = hasVibrator && prefs.getBoolean(Settings.PREF_VIBRATE_ON, false); + mSoundOn = prefs.getBoolean(Settings.PREF_SOUND_ON, + res.getBoolean(R.bool.config_default_sound_enabled)); + + mPopupOn = isPopupEnabled(prefs, res); + mAutoCap = prefs.getBoolean(Settings.PREF_AUTO_CAP, true); + mQuickFixes = isQuickFixesEnabled(prefs, res); + + mAutoCorrectEnabled = isAutoCorrectEnabled(prefs, res); + mBigramSuggestionEnabled = mAutoCorrectEnabled + && isBigramSuggestionEnabled(prefs, res, mAutoCorrectEnabled); + mBigramPredictionEnabled = mBigramSuggestionEnabled + && isBigramPredictionEnabled(prefs, res); + + mAutoCorrectionThreshold = getAutoCorrectionThreshold(prefs, res); + + Utils.setSystemLocale(res, savedLocale); + } + + public boolean isSuggestedPunctuation(int code) { + return mSuggestPuncs.contains(String.valueOf((char)code)); + } + + public boolean isWordSeparator(int code) { + return mWordSeparators.contains(String.valueOf((char)code)); + } + + public boolean isMagicSpaceStripper(int code) { + return mMagicSpaceStrippers.contains(String.valueOf((char)code)); + } + + public boolean isMagicSpaceSwapper(int code) { + return mMagicSpaceSwappers.contains(String.valueOf((char)code)); + } + + // Helper methods + private static boolean isQuickFixesEnabled(SharedPreferences sp, Resources resources) { + final boolean showQuickFixesOption = resources.getBoolean( + R.bool.config_enable_quick_fixes_option); + if (!showQuickFixesOption) { + return isAutoCorrectEnabled(sp, resources); + } + return sp.getBoolean(Settings.PREF_QUICK_FIXES, resources.getBoolean( + R.bool.config_default_quick_fixes)); + } + private static boolean isAutoCorrectEnabled(SharedPreferences sp, Resources resources) { + final String currentAutoCorrectionSetting = sp.getString( + Settings.PREF_AUTO_CORRECTION_THRESHOLD, + resources.getString(R.string.auto_correction_threshold_mode_index_modest)); + final String autoCorrectionOff = resources.getString( + R.string.auto_correction_threshold_mode_index_off); + return !currentAutoCorrectionSetting.equals(autoCorrectionOff); + } + private static boolean isPopupEnabled(SharedPreferences sp, Resources resources) { + final boolean showPopupOption = resources.getBoolean( + R.bool.config_enable_show_popup_on_keypress_option); + if (!showPopupOption) return resources.getBoolean(R.bool.config_default_popup_preview); + return sp.getBoolean(Settings.PREF_POPUP_ON, + resources.getBoolean(R.bool.config_default_popup_preview)); + } + private static boolean isBigramSuggestionEnabled(SharedPreferences sp, Resources resources, + boolean autoCorrectEnabled) { + final boolean showBigramSuggestionsOption = resources.getBoolean( + R.bool.config_enable_bigram_suggestions_option); + if (!showBigramSuggestionsOption) { + return autoCorrectEnabled; + } + return sp.getBoolean(Settings.PREF_BIGRAM_SUGGESTIONS, resources.getBoolean( + R.bool.config_default_bigram_suggestions)); + } + private static boolean isBigramPredictionEnabled(SharedPreferences sp, + Resources resources) { + return sp.getBoolean(Settings.PREF_BIGRAM_PREDICTIONS, resources.getBoolean( + R.bool.config_default_bigram_prediction)); + } + private static double getAutoCorrectionThreshold(SharedPreferences sp, + Resources resources) { + final String currentAutoCorrectionSetting = sp.getString( + Settings.PREF_AUTO_CORRECTION_THRESHOLD, + resources.getString(R.string.auto_correction_threshold_mode_index_modest)); + final String[] autoCorrectionThresholdValues = resources.getStringArray( + R.array.auto_correction_threshold_values); + // When autoCorrectionThreshold is greater than 1.0, it's like auto correction is off. + double autoCorrectionThreshold = Double.MAX_VALUE; + try { + final int arrayIndex = Integer.valueOf(currentAutoCorrectionSetting); + if (arrayIndex >= 0 && arrayIndex < autoCorrectionThresholdValues.length) { + autoCorrectionThreshold = Double.parseDouble( + autoCorrectionThresholdValues[arrayIndex]); + } + } catch (NumberFormatException e) { + // Whenever the threshold settings are correct, never come here. + autoCorrectionThreshold = Double.MAX_VALUE; + Log.w(TAG, "Cannot load auto correction threshold setting." + + " currentAutoCorrectionSetting: " + currentAutoCorrectionSetting + + ", autoCorrectionThresholdValues: " + + Arrays.toString(autoCorrectionThresholdValues)); + } + return autoCorrectionThreshold; + } + private static SuggestedWords createSuggestPuncList(final String puncs) { + SuggestedWords.Builder builder = new SuggestedWords.Builder(); + if (puncs != null) { + for (int i = 0; i < puncs.length(); i++) { + builder.addWord(puncs.subSequence(i, i + 1)); + } + } + return builder.build(); + } + } + private PreferenceScreen mInputLanguageSelection; private CheckBoxPreference mQuickFixes; private ListPreference mVoicePreference; |