diff --git a/java/res/drawable-mdpi/sym_keyboard_label_mic_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_label_mic_holo_dark.png deleted file mode 100644 index 537f39b02..000000000 Binary files a/java/res/drawable-mdpi/sym_keyboard_label_mic_holo_dark.png and /dev/null differ diff --git a/java/res/values-af/strings.xml b/java/res/values-af/strings.xml index 045e97d94..9607ceb4c 100644 --- a/java/res/values-af/strings.xml +++ b/java/res/values-af/strings.xml @@ -117,12 +117,6 @@ "tyd" "URL" "Steminvoerinstellings" - "Op hoofsleutelbord" - "Op simbolesleutelbord" - "Af" - "Mikrofoon op hoofsleutelbord" - "Mikrofoon op simbolesleutelbord" - "Steminvoer is gedeaktiveer" "Stel invoermetodes op" "Invoertale" "Stuur terugvoer" diff --git a/java/res/values-am/strings.xml b/java/res/values-am/strings.xml index 0b81034f4..d131e340c 100644 --- a/java/res/values-am/strings.xml +++ b/java/res/values-am/strings.xml @@ -117,12 +117,6 @@ "ጊዜ" "ዩ አር ኤል" "የድምፅ ግቤት ቁልፍ" - "በዋናቁልፍ ሰሌዳ ላይ" - "በምልክቶች ቁልፍ ሰሌዳ ላይ" - "ውጪ" - "ድምፅ ማጉያ በዋናው ቁልፍሰሌዳው ላይ" - "የድምፅ ማጉያ ምልክትበቁልፍ ሰሌዳላይ" - "የድምፅ ግቤት ቦዝኗል" "ግቤት ሜተዶችን አዋቀር" "ቋንቋዎች አግቤት" "ግብረ-መልስ ላክ" diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml index da331196c..226936b14 100644 --- a/java/res/values-ar/strings.xml +++ b/java/res/values-ar/strings.xml @@ -117,12 +117,6 @@ "الوقت" "‏عنوان URL" "مفتاح الإدخال الصوتي" - "لوحة مفاتيح رئيسية" - "لوحة مفاتيح الرموز" - "إيقاف" - "ميكروفون على لوحة مفاتيح رئيسية" - "ميكروفون على لوحة مفاتيح الرموز" - "الإدخال الصوتي مُعطل" "تهيئة طرق الإدخال" "لغات الإدخال" "إرسال تعليقات" diff --git a/java/res/values-be/strings.xml b/java/res/values-be/strings.xml index 02972f07e..c7aac0c7f 100644 --- a/java/res/values-be/strings.xml +++ b/java/res/values-be/strings.xml @@ -122,12 +122,6 @@ "час" "URL" "Ключ галасавога ўводу" - "На асн. клавіятуры" - "На сімв. клавіятуры" - "Адключана" - "Мік. на асн. клав." - "Мік. на сімв. клав." - "Галасавы набор адкл." "Налада метадаў уводу" "Мовы ўводу" "Адправіць водгук" diff --git a/java/res/values-bg/strings.xml b/java/res/values-bg/strings.xml index c3fbd7982..604c8d97c 100644 --- a/java/res/values-bg/strings.xml +++ b/java/res/values-bg/strings.xml @@ -117,12 +117,6 @@ "часа" "URL адреси" "Клавиш за гласово въвеждане" - "На осн. клавиатура" - "На клав. на симв." - "Изкл." - "Микр. на осн. клав." - "Микр. на клав. на симв." - "Глас. въвежд. е деакт." "Конфигуриране на въвеждането" "Входни езици" "Изпращане на отзиви" diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml index 0b9ee037e..e4623da51 100644 --- a/java/res/values-ca/strings.xml +++ b/java/res/values-ca/strings.xml @@ -117,12 +117,6 @@ "hora" "URL" "Tecla d\'entrada de veu" - "Al teclat principal" - "Al teclat de símbols" - "Desactivada" - "Micròfon al teclat principal" - "Micro en tecl. símb." - "Entrada de veu desactivada" "Configura mètodes d\'entrada" "Idiomes" "Envia comentaris" diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml index c73e8ab1c..4b883e35a 100644 --- a/java/res/values-cs/strings.xml +++ b/java/res/values-cs/strings.xml @@ -117,12 +117,6 @@ "čas" "adresy URL" "Klávesa hlasového vstupu" - "Na hlavní klávesnici" - "Na klávesnici se symboly" - "Vypnuto" - "Mikrofon na hlavní klávesnici" - "Mikrofon na klávesnici se symboly" - "Hlasový vstup vypnut" "Konfigurace metod zadávání" "Vstupní jazyky" "Odeslat zpětnou vazbu" diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml index 86bdad469..33ac25b45 100644 --- a/java/res/values-da/strings.xml +++ b/java/res/values-da/strings.xml @@ -117,12 +117,6 @@ "klokkeslæt" "Webadresse" "Nøgle til stemmeinput" - "På hovedtastatur" - "På symboltastatur" - "Fra" - "Mik. på hovedtastatur" - "Mik. på symboltastatur" - "Stemmeinput deaktiveret" "Konfigurer inputmetoder" "Inputsprog" "Send feedback" diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml index b65053465..563f4c277 100644 --- a/java/res/values-de/strings.xml +++ b/java/res/values-de/strings.xml @@ -117,12 +117,6 @@ "Zeit" "URL" "Taste für Spracheingabe" - "Auf Haupttastatur" - "Auf Symboltastatur" - "Aus" - "Mikro auf Haupttastatur" - "Mikro auf Symboltastatur" - "Spracheingabe deaktiviert" "Eingabemethoden konfigurieren" "Eingabesprachen" "Feedback geben" diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml index 79e83423c..138d64da5 100644 --- a/java/res/values-el/strings.xml +++ b/java/res/values-el/strings.xml @@ -117,12 +117,6 @@ "ώρα" "διεύθυνση URL" "Κλειδί φωνητικής εξόδου" - "Στο κύριο πληκτρολ." - "Πληκτρ. συμβ. ενερ." - "Απενεργοποίηση" - "Μικ. στο κύριο πληκ." - "Μικ. στο πληκ. συμβ." - "Απεν. φωνητ. είσοδος" "Διαμόρφωση μεθόδων εισαγωγής" "Γλώσσες εισόδου" "Αποστολή σχολίων" diff --git a/java/res/values-en-rGB/strings.xml b/java/res/values-en-rGB/strings.xml index 4bc1b15cf..56a8b90de 100644 --- a/java/res/values-en-rGB/strings.xml +++ b/java/res/values-en-rGB/strings.xml @@ -117,12 +117,6 @@ "time" "URL" "Voice input key" - "On main keyboard" - "On symbols keyboard" - "Off" - "Mic on main keyboard" - "Mic on symbols keyboard" - "Voice input is disabled" "Configure input methods" "Input languages" "Send feedback" diff --git a/java/res/values-en-rIN/strings.xml b/java/res/values-en-rIN/strings.xml index 4bc1b15cf..56a8b90de 100644 --- a/java/res/values-en-rIN/strings.xml +++ b/java/res/values-en-rIN/strings.xml @@ -117,12 +117,6 @@ "time" "URL" "Voice input key" - "On main keyboard" - "On symbols keyboard" - "Off" - "Mic on main keyboard" - "Mic on symbols keyboard" - "Voice input is disabled" "Configure input methods" "Input languages" "Send feedback" diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml index 1fd9cf8f0..e33bbd5a7 100644 --- a/java/res/values-es-rUS/strings.xml +++ b/java/res/values-es-rUS/strings.xml @@ -117,12 +117,6 @@ "hora" "URL" "Tecla de entrada por voz" - "En el teclado principal" - "En el teclado de símbolos" - "Desactivado" - "Micrófono en el teclado principal" - "Micrófono en el teclado de símbolos" - "La entrada por voz está inhabilitada" "Configurar métodos de entrada" "Idiomas de entrada" "Enviar comentarios" diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml index 39b45e0c4..8240c89a5 100644 --- a/java/res/values-es/strings.xml +++ b/java/res/values-es/strings.xml @@ -117,12 +117,6 @@ "hora" "URL" "Tecla de entrada de voz" - "En teclado principal" - "En teclado de símbolos" - "No" - "Micrófono en teclado principal" - "Micrófono en teclado de símbolos" - "Entrada de voz inhabilitada" "Configurar métodos de entrada" "Idiomas" "Danos tu opinión" diff --git a/java/res/values-et-rEE/strings.xml b/java/res/values-et-rEE/strings.xml index e0f992c0d..a01d5636c 100644 --- a/java/res/values-et-rEE/strings.xml +++ b/java/res/values-et-rEE/strings.xml @@ -117,12 +117,6 @@ "aeg" "URL" "Häälesisendi klahv" - "Peamisel klaviatuuril" - "Sümbolite klaviatuuril" - "Väljas" - "Mikrofon peamisel klaviatuuril" - "Mikr. sümb. klaviat." - "Kõnesisend on keelatud" "Sisestusmeetodite seadistamine" "Sisestuskeeled" "Saatke tagasisidet" diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml index af886ef8c..714dbc8fc 100644 --- a/java/res/values-fa/strings.xml +++ b/java/res/values-fa/strings.xml @@ -121,12 +121,6 @@ "زمان" "نشانی اینترنتی" "کلید ورودی صدا" - "در صفحه‌کلید اصلی" - "در صفحه‌کلید نمادها" - "خاموش" - "میکروفن در صفحه‌کلید اصلی" - "میکروفن در صفحه‌کلید نمادها" - "ورودی صدا غیرفعال است" "پیکربندی روش‌های ورودی" "زبان‌های ورودی" "ارسال بازخورد" diff --git a/java/res/values-fi/strings.xml b/java/res/values-fi/strings.xml index a58bfac3e..f623d1a1e 100644 --- a/java/res/values-fi/strings.xml +++ b/java/res/values-fi/strings.xml @@ -117,12 +117,6 @@ "aika" "URL-osoite" "Äänisyöteavain" - "Päänäppäimistössä" - "Symbolinäppäim." - "Ei käytössä" - "Mikr. päänäppäim." - "Mikr. symbolinäpp." - "Äänisyöte ei käyt." "Määritä syöttötavat" "Syöttökielet" "Lähetä palautetta" diff --git a/java/res/values-fr-rCA/strings.xml b/java/res/values-fr-rCA/strings.xml index 2551ce9f8..8ff60f621 100644 --- a/java/res/values-fr-rCA/strings.xml +++ b/java/res/values-fr-rCA/strings.xml @@ -117,12 +117,6 @@ "Heure" "URL" "Touche de saisie vocale" - "Sur le clavier principal" - "Sur clavier symboles" - "Désactiver" - "Micro sur le clavier principal" - "Micro sur le clavier des symboles" - "Saisie vocale désactivée" "Configurer les modes de saisie" "Langues de saisie" "Envoyer des commentaires" diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml index b877db014..9ab95583d 100644 --- a/java/res/values-fr/strings.xml +++ b/java/res/values-fr/strings.xml @@ -117,12 +117,6 @@ "Heure" "URL" "Touche de saisie vocale" - "Sur clavier principal" - "Sur clavier symboles" - "Désactiver" - "Micro sur le clavier principal" - "Micro sur clavier symboles" - "Saisie vocale désactivée" "Configurer les modes de saisie" "Langues de saisie" "Envoyer des commentaires" diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml index d7735433d..d2ace1ac7 100644 --- a/java/res/values-hi/strings.xml +++ b/java/res/values-hi/strings.xml @@ -117,12 +117,6 @@ "समय" "URL" "ध्‍वनि‍ इनपुट कुंजी" - "मुख्‍य कीबोर्ड पर" - "प्रतीक कीबोर्ड पर" - "बंद" - "मुख्‍य कीबोर्ड पर माइक" - "प्रतीक कीबोर्ड पर माइक" - "ध्‍वनि इनपुट अक्षम है" "इनपुट पद्धति कॉन्‍फ़िगर करें" "इनपुट भाषा" "सुझाव भेजें" diff --git a/java/res/values-hr/strings.xml b/java/res/values-hr/strings.xml index b9cfef384..e7a72f9c4 100644 --- a/java/res/values-hr/strings.xml +++ b/java/res/values-hr/strings.xml @@ -117,12 +117,6 @@ "vrijeme" "URL" "Tipka za glasovni unos" - "Na glavnoj tipkovnici" - "Na tipkovnici simb." - "Isključeno" - "Mikrofon na gl. tipkovnici" - "Mik. na tipk. simb." - "Glas. unos onemog." "Konfiguriraj načine ulaza" "Jezici unosa" "Slanje povratnih informacija" diff --git a/java/res/values-hu/strings.xml b/java/res/values-hu/strings.xml index a61378fca..27efd0c92 100644 --- a/java/res/values-hu/strings.xml +++ b/java/res/values-hu/strings.xml @@ -117,12 +117,6 @@ "idő" "URL" "Hangbeviteli gomb" - "A fő billentyűzeten" - "Szimbólumoknál" - "Ki" - "Mikrofon a billentyűzeten" - "Mikr. a szimbólumoknál" - "Hangbevivel KI" "Beviteli módok beállítása" "Beviteli nyelvek" "Visszajelzés küldése" diff --git a/java/res/values-hy-rAM/strings.xml b/java/res/values-hy-rAM/strings.xml index 0b8e19a76..62dc45b1f 100644 --- a/java/res/values-hy-rAM/strings.xml +++ b/java/res/values-hy-rAM/strings.xml @@ -117,12 +117,6 @@ "ժամանակ" "URL" "Ձայնային մուտքագրման ստեղն" - "Հիմնական ստեղնաշարի վրա" - "Նշանների ստեղնաշարի վրա" - "Անջատված" - "Բարձրախոս հիմնական ստեղնաշարի վրա" - "Բարձրախոս նշանների ստեղնաշարի վրա" - "Ձայնային մուտքագրումն անջատված է" "Կարգավորել մուտքագրման մեթոդները" "Մուտքագրման լեզուներ" "Արձագանքել" diff --git a/java/res/values-in/strings.xml b/java/res/values-in/strings.xml index d83a22c6c..83530f2b9 100644 --- a/java/res/values-in/strings.xml +++ b/java/res/values-in/strings.xml @@ -117,12 +117,6 @@ "waktu" "URL" "Tombol masukan suara" - "Pada keyboard utama" - "Pada keyboard simbol" - "Mati" - "Mik pada keyboard utama" - "Mik pada keyboard simbol" - "Masukan suara dinonaktifkan" "Konfigurasikan metode masukan" "Bahasa masukan" "Kirim masukan" diff --git a/java/res/values-is/strings.xml b/java/res/values-is/strings.xml index 6f685d395..1137fd09d 100644 --- a/java/res/values-is/strings.xml +++ b/java/res/values-is/strings.xml @@ -214,18 +214,6 @@ - - - - - - - - - - - - diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml index 1111c4901..12b597ac3 100644 --- a/java/res/values-it/strings.xml +++ b/java/res/values-it/strings.xml @@ -117,12 +117,6 @@ "ora" "URL" "Tasto input vocale" - "Su tastiera principale" - "Su tastiera simboli" - "OFF" - "Microfono su tastiera principale" - "Microfono su tastiera simboli" - "Input vocale disatt." "Configura metodi di immissione" "Lingue comandi" "Invia feedback" diff --git a/java/res/values-iw/strings.xml b/java/res/values-iw/strings.xml index 8d02e685b..ab15649d0 100644 --- a/java/res/values-iw/strings.xml +++ b/java/res/values-iw/strings.xml @@ -117,12 +117,6 @@ "זמן" "כתובות אתרים" "מקש קלט קולי" - "במקלדת הראשית" - "במקלדת סמלים" - "כבוי" - "מיקרופון במקלדת הראשית" - "מיקרופון במקלדת סמלים" - "הקלט הקולי מושבת" "הגדרת שיטות קלט" "שפות קלט" "שלח משוב" diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index fbfd3b7f7..39f14ff35 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -117,12 +117,6 @@ "時刻" "URL" "音声入力キー" - "メインキーボード上" - "記号キーボード上" - "OFF" - "メインキーボードのマイク" - "記号キーボードのマイク" - "音声入力は無効です" "入力方法を設定" "入力言語" "フィードバックを送信" diff --git a/java/res/values-ka-rGE/strings.xml b/java/res/values-ka-rGE/strings.xml index dec6b3a6b..2adf9c440 100644 --- a/java/res/values-ka-rGE/strings.xml +++ b/java/res/values-ka-rGE/strings.xml @@ -117,12 +117,6 @@ "დრო" "URL" "ხმოვანი შეყვანის კლავიში" - "მთავარ კლავიატურაზე" - "სიმბოლოთა კლავიატურაზე" - "გამორთვა" - "მიკროფონი მთავარ კლავიატურაზე" - "მიკროფონი სიმბოლოთა კლავიატურაზე" - "ხმოვანი შეყვანა გამორთულია" "შეყვანის მეთოდების კონფიგურაცია" "შეყვანის ენები" "უკუკავშირის გაგზავნა" diff --git a/java/res/values-kk/strings.xml b/java/res/values-kk/strings.xml index 947ff2fe9..80b289f4d 100644 --- a/java/res/values-kk/strings.xml +++ b/java/res/values-kk/strings.xml @@ -119,12 +119,6 @@ "уақыт" "URL" "Дауыстық енгізу пернесі" - "Негізгі пернетақтада" - "Таңбалар пернетақтасында" - "Өшірулі" - "Негізгі пернетақтадағы Mic" - "Таңбалар пернетақтасындағы Mic" - "Дауыстық енгізу өшірілген" "Енгізу әдістерін теңшеу" "Енгізу тілдері" "Кері байланыс жіберу" diff --git a/java/res/values-km-rKH/strings.xml b/java/res/values-km-rKH/strings.xml index 86ecc5e10..0609bd26d 100644 --- a/java/res/values-km-rKH/strings.xml +++ b/java/res/values-km-rKH/strings.xml @@ -117,12 +117,6 @@ "ពេលវេលា" "URL" "គ្រាប់​ចុច​បញ្ចូល​​សំឡេង" - "នៅ​លើ​ក្ដារចុច​ចម្បង" - "នៅ​លើ​ក្ដារចុច​​និមិត្ត​សញ្ញា" - "បិទ" - "មីក្រូហ្វូន​នៅ​លើ​​ក្ដារចុច​ចម្បង" - "មីក្រូហ្វូន​នៅ​លើ​​ក្ដារចុច​និមិត្ត​សញ្ញា" - "បាន​បិទ​ការ​បញ្ចូល​សំឡេង" "កំណត់​រចនាសម្ព័ន្ធ​វិធីសាស្ត្រ​បញ្ចូល" "បញ្ចូល​ភាសា" "ផ្ញើ​មតិ​អ្នក​ប្រើ" diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml index ca10bdf52..678cc3ee4 100644 --- a/java/res/values-ko/strings.xml +++ b/java/res/values-ko/strings.xml @@ -117,12 +117,6 @@ "시간" "URL" "음성 입력 키" - "기본 키보드" - "기호 키보드" - "사용 안함" - "기본 키보드의 마이크" - "기호 키보드의 마이크" - "음성 입력이 사용 중지됨" "입력 방법 설정" "입력 언어" "의견 보내기" diff --git a/java/res/values-ky/strings.xml b/java/res/values-ky/strings.xml index e30c4b965..c3aab7858 100644 --- a/java/res/values-ky/strings.xml +++ b/java/res/values-ky/strings.xml @@ -168,18 +168,6 @@ - - - - - - - - - - - - diff --git a/java/res/values-lo-rLA/strings.xml b/java/res/values-lo-rLA/strings.xml index a4dbc2de2..bbf1715b8 100644 --- a/java/res/values-lo-rLA/strings.xml +++ b/java/res/values-lo-rLA/strings.xml @@ -117,12 +117,6 @@ "ເວລາ" "URL" "ປຸ່ມປ້ອນຂໍ້ມູນດ້ວຍສຽງ" - "ແປ້ນພິມຫຼັກ" - "ໃນແປ້ນພິມສັນຍາລັກ" - "ປິດ" - "ໄມໃນແປ້ນພິມຫຼັກ" - "ໄມໃນແປ້ນພິມສັນຍາລັກ" - "ການປ້ອນຂໍ້ມູນດ້ວຍສຽງປິດນຳໃຊ້ຢູ່" "ຕັ້ງຄ່າຮູບແບບການປ້ອນຂໍ້ມູນ" "ພາສາການປ້ອນຂໍ້ມູນ" "ສົ່ງຄຳຕິຊົມ" diff --git a/java/res/values-lt/strings.xml b/java/res/values-lt/strings.xml index 1f943944c..bf37143db 100644 --- a/java/res/values-lt/strings.xml +++ b/java/res/values-lt/strings.xml @@ -117,12 +117,6 @@ "laiko" "URL" "Įvesties balsu klavišas" - "Pagr. klaviatūroje" - "Simbolių klaviatūr." - "Išjungta" - "Mikrof. pagr. klav." - "Mikrof. simb. klav." - "Balso įv. neleidž." "Konfigūruoti įvesties metodus" "Įvesties kalbos" "Siųsti atsiliepimą" diff --git a/java/res/values-lv/strings.xml b/java/res/values-lv/strings.xml index 8ea24edb7..9afea26b8 100644 --- a/java/res/values-lv/strings.xml +++ b/java/res/values-lv/strings.xml @@ -117,12 +117,6 @@ "laiks" "URL" "Balss ievades atslēga" - "Uz galv. tastatūras" - "Uz simbolu tastat." - "Izslēgts" - "Mikr.uz galv.tastat." - "Mikr.uz simb.tastat." - "Balss iev. atspējota" "Ievades metožu konfigurēšana" "Ievades valodas" "Sūtīt atsauksmes" diff --git a/java/res/values-mk/strings.xml b/java/res/values-mk/strings.xml index 6f685d395..1137fd09d 100644 --- a/java/res/values-mk/strings.xml +++ b/java/res/values-mk/strings.xml @@ -214,18 +214,6 @@ - - - - - - - - - - - - diff --git a/java/res/values-mn-rMN/strings.xml b/java/res/values-mn-rMN/strings.xml index d4175899f..4b36f03d6 100644 --- a/java/res/values-mn-rMN/strings.xml +++ b/java/res/values-mn-rMN/strings.xml @@ -117,12 +117,6 @@ "цаг" "URL" "Дуун оруулгын товч" - "Үндсэн гар дээр" - "Симбол гар дээр" - "Идэвхгүй" - "Мик үндсэн гар дээр" - "Мик симбол гар дээр" - "Дуун оруулах идэвхгүйжсэн" "Оруулах аргуудын тохиргоо" "Оруулах хэл" "Санал хүсэлт илгээх" diff --git a/java/res/values-ms-rMY/strings.xml b/java/res/values-ms-rMY/strings.xml index c9b4a0359..d3ab3f97c 100644 --- a/java/res/values-ms-rMY/strings.xml +++ b/java/res/values-ms-rMY/strings.xml @@ -117,12 +117,6 @@ "masa" "URL" "Kunci input suara" - "Pada papan kekunci utama" - "Pada papan kekunci simbol" - "Dimati" - "Mikrofon pada papan kekunci utama" - "Mikrofon pada papan kekunci simbol" - "Input suara dilmphkn" "Konfigurasikan kaedah input" "Bahasa input" "Hantar maklum balas" diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml index f90aa6d0b..6d9f64fb3 100644 --- a/java/res/values-nb/strings.xml +++ b/java/res/values-nb/strings.xml @@ -117,12 +117,6 @@ "tid" "Nettadresse" "Tast for taleinndata" - "På hovedtastatur" - "På talltastatur" - "Av" - "Mikrofon på hovedtast." - "Mikrofon på talltastatur" - "Taleinndata er deaktiv." "Konfigurer inndatametoder" "Inndataspråk" "Send tilbakemelding" diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml index dcbf2c09c..f99c34520 100644 --- a/java/res/values-nl/strings.xml +++ b/java/res/values-nl/strings.xml @@ -117,12 +117,6 @@ "tijd" "URL" "Toets voor spraakinvoer" - "Op hoofdtoetsenbord" - "Op symbooltoetsenb." - "Uitgeschakeld" - "Microfoon op hoofdtoetsenbord" - "Mic op symb.toetsb." - "Spraakinvoer is uit" "Invoermethoden configureren" "Invoertalen" "Feedback verzenden" diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml index c78674a9b..558415d89 100644 --- a/java/res/values-pl/strings.xml +++ b/java/res/values-pl/strings.xml @@ -117,12 +117,6 @@ "godzina" "URL" "Klawisz rozpoznawania mowy" - "Na klawiaturze głównej" - "Na klawiaturze z symbolami" - "Wyłącz" - "Mikrofon na klawiaturze głównej" - "Mikrofon na klawiaturze z symbolami" - "Rozpoznawanie mowy jest wyłączone" "Konfiguruj metody wprowadzania" "Języki wprowadzania" "Prześlij opinię" diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml index c27758116..36425e174 100644 --- a/java/res/values-pt-rPT/strings.xml +++ b/java/res/values-pt-rPT/strings.xml @@ -117,12 +117,6 @@ "hora" "URLs" "Chave de entrada de voz" - "No teclado principal" - "No teclado símbolos" - "Desligar" - "Mic. tecl. principal" - "Mic. tecl. símbolos" - "Entr. voz desact." "Configurar métodos de introdução" "Idiomas de entrada" "Enviar comentários" diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml index f98ef8cd6..925adf0b0 100644 --- a/java/res/values-pt/strings.xml +++ b/java/res/values-pt/strings.xml @@ -117,12 +117,6 @@ "hora" "URL" "Chave de entrada de texto por voz" - "No teclado principal" - "No teclado de símb." - "Desativado" - "Mic. no teclado" - "Mic. no teclado" - "Texto por voz desat." "Configurar métodos de entrada" "Idiomas de entrada" "Enviar comentários" diff --git a/java/res/values-rm/strings.xml b/java/res/values-rm/strings.xml index 3f0bab963..378c25426 100644 --- a/java/res/values-rm/strings.xml +++ b/java/res/values-rm/strings.xml @@ -209,18 +209,6 @@ - - - - - - - - - - - - "Linguas da cumonds vocals" diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml index 147f83e61..9758a0b62 100644 --- a/java/res/values-ro/strings.xml +++ b/java/res/values-ro/strings.xml @@ -117,12 +117,6 @@ "ore" "adrese URL" "Tastă pentru intrarea vocală" - "Pe tastat. princip." - "Pe tastat. simbol." - "Dezactivată" - "Mic. pe tast. princ." - "Micr. pe tast. simb." - "Intr. vocală dezact." "Configuraţi metodele de intrare" "Selectaţi limba" "Trimiteți feedback" diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml index 8bbaead0a..36990fe41 100644 --- a/java/res/values-ru/strings.xml +++ b/java/res/values-ru/strings.xml @@ -117,12 +117,6 @@ "ввода времени" "ввода URL" "Кнопка голосового ввода" - "Значок на основной клавиатуре" - "Значок на клавиатуре символов" - "Выкл." - "Значок на основной клавиатуре" - "Значок на клавиатуре символов" - "Голосовой ввод откл." "Настройка способов ввода" "Языки ввода" "Отправить отзыв" diff --git a/java/res/values-sk/strings.xml b/java/res/values-sk/strings.xml index d1f966cea..42e55fa1f 100644 --- a/java/res/values-sk/strings.xml +++ b/java/res/values-sk/strings.xml @@ -117,12 +117,6 @@ "čas" "Adresa URL" "Kľúč hlasového vstupu" - "Na hlavnej klávesnici" - "Na klávesnici so symbolmi" - "Vypnuté" - "Mikrofón na hlavnej klávesnici" - "Mikrofón na klávesnici so symbolmi" - "Hlasový vstup je zakázaný" "Konfigurovať metódy vstupu" "Jazyky vstupu" "Odoslať spätnú väzbu" diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml index a0f83c12f..59113e30b 100644 --- a/java/res/values-sl/strings.xml +++ b/java/res/values-sl/strings.xml @@ -117,12 +117,6 @@ "ura" "URL" "Tipka za glasovni vnos" - "Na glavni tipkovnici" - "Na tipk. s simboli" - "Izklopljeno" - "Mik. na glavni tipk." - "Mik. na tipk. s sim." - "Glas. vnos je onem." "Nastavitev načinov vnosa" "Jeziki vnosa" "Pošljite povratne informacije" diff --git a/java/res/values-sr/strings.xml b/java/res/values-sr/strings.xml index ce4978ff5..663cb327d 100644 --- a/java/res/values-sr/strings.xml +++ b/java/res/values-sr/strings.xml @@ -117,12 +117,6 @@ "време" "URL" "Тастер за гласовни унос" - "На главној тастатури" - "На тастатури са симболима" - "Искључи" - "Микрофон на главној тастатури" - "Микрофон на тастатури са симболима" - "Гласовни унос је онемогућен" "Конфигурисање метода уноса" "Језици за унос" "Пошаљи повратне информације" diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml index afe349afd..f5e129af9 100644 --- a/java/res/values-sv/strings.xml +++ b/java/res/values-sv/strings.xml @@ -117,12 +117,6 @@ "klockslag" "webbadresser" "Röstinmatningsknapp" - "På huvudtangentbord" - "På symboltangentbord" - "Av" - "Mick huvudtangentbord" - "Mick bland symboler" - "Röstinmatning inaktiv" "Konfigurera inmatningsmetoder" "Inmatningsspråk" "Skicka feedback" diff --git a/java/res/values-sw/strings.xml b/java/res/values-sw/strings.xml index 191ad977c..8e23496d1 100644 --- a/java/res/values-sw/strings.xml +++ b/java/res/values-sw/strings.xml @@ -117,12 +117,6 @@ "wakati" "URL" "Kibao cha kuweka data kwa kutamka" - "Kwenye kibodi kuu" - "Kwenye kibodi ya ishara" - "Zima" - "Maikrofoni kwenye kibodi kuu" - "Maikrofoni kwenye kibodi ya ishara" - "Kipengele cha kuweka data kwa kutamka kimezimwa" "Sanidi mbinu za uingizaji" "Lugha za uingizaji" "Tuma maoni" diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml index 9249c05d5..8b1567679 100644 --- a/java/res/values-th/strings.xml +++ b/java/res/values-th/strings.xml @@ -117,12 +117,6 @@ "เวลา" "URL" "แป้นการป้อนข้อมูลด้วยเสียง" - "บนแป้นพิมพ์หลัก" - "บนแป้นพิมพ์สัญลักษณ์" - "ปิด" - "ไมค์บนแป้นพิมพ์หลัก" - "ไมค์บนแป้นพิมพ์สัญลักษณ์" - "ปิดใช้งานป้อนข้อมูลด้วยเสียง" "กำหนดค่าวิธีการป้อนข้อมูล" "ภาษาในการป้อนข้อมูล" "ส่งข้อเสนอแนะ" diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml index df6bda09b..5da0861a9 100644 --- a/java/res/values-tl/strings.xml +++ b/java/res/values-tl/strings.xml @@ -117,12 +117,6 @@ "oras" "URL" "Voice input key" - "Sa pangunahing keyboard" - "Sa keyboard ng mga simbolo" - "Naka-off" - "Mic sa pangunahing keyboard" - "Mic sa keyboard ng mga simbolo" - "Hindi pinagana ang voice input" "I-configure ang mga pamamaraan ng pag-input" "Mag-input ng mga wika" "Magpadala ng feedback" diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml index a14295153..7304f464b 100644 --- a/java/res/values-tr/strings.xml +++ b/java/res/values-tr/strings.xml @@ -117,12 +117,6 @@ "saat" "URL" "Ses girişi tuşu" - "Ana klavyede" - "Simge klavyesinde" - "Kapalı" - "Ana klavyedeki mikrofon" - "Simge klavysnd mikrf" - "Sesle grş devre dışı" "Giriş yöntemlerini yapılandır" "Giriş dilleri" "Geri bildirim gönder" diff --git a/java/res/values-uk/strings.xml b/java/res/values-uk/strings.xml index da26d5005..ab952912d 100644 --- a/java/res/values-uk/strings.xml +++ b/java/res/values-uk/strings.xml @@ -117,12 +117,6 @@ "час" "URL-адреси" "Ключ голосового вводу" - "На основ. клавіатурі" - "Символьна клавіатура" - "Вимк." - "Мікрофон на основній клавіатурі" - "Miкр. на симв. клавіат." - "Голос. ввід вимкнено" "Налаштування методів введення" "Мови вводу" "Надіслати відгук" diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml index 81cd373e4..d75016a0a 100644 --- a/java/res/values-vi/strings.xml +++ b/java/res/values-vi/strings.xml @@ -117,12 +117,6 @@ "giờ" "URL" "Khóa nhập giọng nói" - "Trên bàn phím chính" - "Trên bàn phím biểu tượng" - "Tắt" - "Micrô trên bàn phím chính" - "Micrô trên bàn phím biểu tượng" - "Nhập liệu bằng giọng nói đã bị tắt" "Định cấu hình phương thức nhập" "Ngôn ngữ nhập" "Gửi phản hồi" diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml index d347c9ce8..1b59935a2 100644 --- a/java/res/values-zh-rCN/strings.xml +++ b/java/res/values-zh-rCN/strings.xml @@ -117,12 +117,6 @@ "时间" "网址" "语音输入键" - "主键盘上" - "符号键盘上" - "关闭" - "主键盘上的麦克风" - "符号键盘上的麦克风" - "语音输入功能已停用" "配置输入法" "输入语言" "发送反馈" diff --git a/java/res/values-zh-rHK/strings.xml b/java/res/values-zh-rHK/strings.xml index 306045591..665728db7 100644 --- a/java/res/values-zh-rHK/strings.xml +++ b/java/res/values-zh-rHK/strings.xml @@ -117,12 +117,6 @@ "時間" "網址" "語音輸入鍵" - "於主鍵盤" - "符號鍵盤上" - "關閉" - "主鍵盤上的麥克風" - "符號鍵盤上的麥克風" - "語音輸入已停用" "設定輸入法" "輸入語言" "傳送意見" diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml index 2c474b79e..d082fc744 100644 --- a/java/res/values-zh-rTW/strings.xml +++ b/java/res/values-zh-rTW/strings.xml @@ -117,12 +117,6 @@ "時間" "網址" "語音輸入按鍵" - "主鍵盤上" - "符號鍵盤上" - "關閉" - "主鍵盤上的麥克風" - "符號鍵盤上的麥克風" - "語音輸入已停用" "設定輸入法" "輸入語言" "提供意見" diff --git a/java/res/values-zu/strings.xml b/java/res/values-zu/strings.xml index 27d11316c..fb2cd6e34 100644 --- a/java/res/values-zu/strings.xml +++ b/java/res/values-zu/strings.xml @@ -117,12 +117,6 @@ "isikhathi" "I-URL" "Inkinobho yokufaka izwi" - "Kwikhibhodi eyisisekelo" - "Ikhibhodi yezimpawu" - "VALIWE" - "I-mic kwikhibhodi eyisisekelo" - "Ikhibhodi yezimpawu ze-mic" - "Okufakwayo ngezwi kuvinjelwe" "Misa izindlela zokufakwayo" "Izilimi zokufakwayo" "Thumela impendulo" diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index ad4b296e1..f815190c8 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -221,7 +221,6 @@ - @@ -298,6 +297,7 @@ + @@ -424,7 +424,6 @@ - diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index af5ec061b..72402e956 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -74,26 +74,9 @@ @string/auto_correction_threshold_mode_very_aggressive + 0 - 1 - 2 - - @string/voice_mode_main - @string/voice_mode_symbols - @string/voice_mode_off - - - - @string/voice_input_modes_main_keyboard - @string/voice_input_modes_symbols_keyboard - @string/voice_input_modes_off - - - - @string/voice_input_modes_summary_main_keyboard - @string/voice_input_modes_summary_symbols_keyboard - @string/voice_input_modes_summary_off - Android keyboard Debug settings diff --git a/java/res/values/keyboard-icons-holo.xml b/java/res/values/keyboard-icons-holo.xml index b49e1d10b..4c888d570 100644 --- a/java/res/values/keyboard-icons-holo.xml +++ b/java/res/values/keyboard-icons-holo.xml @@ -32,7 +32,6 @@ @drawable/sym_keyboard_search_holo_dark @drawable/sym_keyboard_tab_holo_dark @drawable/sym_keyboard_voice_holo_dark - @drawable/sym_keyboard_label_mic_holo_dark @drawable/sym_keyboard_space_holo_dark @drawable/sym_keyboard_shift_locked_holo_dark @drawable/sym_keyboard_voice_off_holo_dark diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 11b3ea3af..a269d4979 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -245,21 +245,6 @@ Voice input key - - - On main keyboard - - On symbols keyboard - - Off - - - Mic on main keyboard - - Mic on symbols keyboard - - Voice input is disabled - Configure input methods diff --git a/java/res/values/themes-gb.xml b/java/res/values/themes-gb.xml index 34075e70a..f417d84ca 100644 --- a/java/res/values/themes-gb.xml +++ b/java/res/values/themes-gb.xml @@ -40,7 +40,6 @@ @drawable/sym_keyboard_search_holo_dark @drawable/sym_keyboard_tab_holo_dark @drawable/sym_keyboard_mic_holo_dark - @drawable/sym_keyboard_label_mic_holo_dark @drawable/sym_keyboard_space @drawable/sym_keyboard_shift_locked_holo_dark diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index c9d87bfd4..a3b6507ce 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -160,27 +160,10 @@ latin:keyLabelFlags="preserveCase" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> - - - - - - - - - + { final int x = (int)row.getKeyX(null); final int y = row.getKeyY(); final Key key = new Key(mParams, label, null /* hintLabel */, 0 /* iconId */, - code, outputText, x, y, (int)keyWidth, (int)row.getRowHeight(), + code, outputText, x, y, (int)keyWidth, row.getRowHeight(), row.getDefaultKeyLabelFlags(), row.getDefaultBackgroundType()); endKey(key); row.advanceXPos(keyWidth); @@ -651,8 +651,6 @@ public class KeyboardBuilder { R.styleable.Keyboard_Case_clobberSettingsKey, id.mClobberSettingsKey); final boolean shortcutKeyEnabledMatched = matchBoolean(caseAttr, R.styleable.Keyboard_Case_shortcutKeyEnabled, id.mShortcutKeyEnabled); - final boolean shortcutKeyOnSymbolsMatched = matchBoolean(caseAttr, - R.styleable.Keyboard_Case_shortcutKeyOnSymbols, id.mShortcutKeyOnSymbols); final boolean hasShortcutKeyMatched = matchBoolean(caseAttr, R.styleable.Keyboard_Case_hasShortcutKey, id.mHasShortcutKey); final boolean languageSwitchKeyEnabledMatched = matchBoolean(caseAttr, @@ -671,13 +669,12 @@ public class KeyboardBuilder { final boolean selected = keyboardLayoutSetMatched && keyboardLayoutSetElementMatched && modeMatched && navigateNextMatched && navigatePreviousMatched && passwordInputMatched && clobberSettingsKeyMatched - && shortcutKeyEnabledMatched && shortcutKeyOnSymbolsMatched - && hasShortcutKeyMatched && languageSwitchKeyEnabledMatched - && isMultiLineMatched && imeActionMatched && localeCodeMatched - && languageCodeMatched && countryCodeMatched; + && shortcutKeyEnabledMatched && hasShortcutKeyMatched + && languageSwitchKeyEnabledMatched && isMultiLineMatched && imeActionMatched + && localeCodeMatched && languageCodeMatched && countryCodeMatched; if (DEBUG) { - startTag("<%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s>%s", TAG_CASE, + startTag("<%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s>%s", TAG_CASE, textAttr(caseAttr.getString( R.styleable.Keyboard_Case_keyboardLayoutSet), "keyboardLayoutSet"), textAttr(caseAttr.getString( @@ -696,8 +693,6 @@ public class KeyboardBuilder { "passwordInput"), booleanAttr(caseAttr, R.styleable.Keyboard_Case_shortcutKeyEnabled, "shortcutKeyEnabled"), - booleanAttr(caseAttr, R.styleable.Keyboard_Case_shortcutKeyOnSymbols, - "shortcutKeyOnSymbols"), booleanAttr(caseAttr, R.styleable.Keyboard_Case_hasShortcutKey, "hasShortcutKey"), booleanAttr(caseAttr, R.styleable.Keyboard_Case_languageSwitchKeyEnabled, diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java index 336db186e..0ee935f60 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java @@ -48,7 +48,6 @@ public final class KeyboardIconsSet { "search_key", R.styleable.Keyboard_iconSearchKey, "tab_key", R.styleable.Keyboard_iconTabKey, "shortcut_key", R.styleable.Keyboard_iconShortcutKey, - "shortcut_for_label", R.styleable.Keyboard_iconShortcutForLabel, "space_key_for_number_layout", R.styleable.Keyboard_iconSpaceKeyForNumberLayout, "shift_key_shifted", R.styleable.Keyboard_iconShiftKeyShifted, "shortcut_key_disabled", R.styleable.Keyboard_iconShortcutKeyDisabled, diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index f331c78e5..032d44dc9 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -374,16 +374,20 @@ public final class SettingsValues { return autoCorrectionThreshold; } - private static boolean needsToShowVoiceInputKey(SharedPreferences prefs, Resources res) { - final String voiceModeMain = res.getString(R.string.voice_mode_main); - final String voiceMode = prefs.getString(Settings.PREF_VOICE_MODE_OBSOLETE, voiceModeMain); - final boolean showsVoiceInputKey = voiceMode == null || voiceMode.equals(voiceModeMain); - if (!showsVoiceInputKey) { - // Migrate settings from PREF_VOICE_MODE_OBSOLETE to PREF_VOICE_INPUT_KEY - // Set voiceModeMain as a value of obsolete voice mode settings. - prefs.edit().putString(Settings.PREF_VOICE_MODE_OBSOLETE, voiceModeMain).apply(); - // Disable voice input key. - prefs.edit().putBoolean(Settings.PREF_VOICE_INPUT_KEY, false).apply(); + private static boolean needsToShowVoiceInputKey(final SharedPreferences prefs, + final Resources res) { + if (!prefs.contains(Settings.PREF_VOICE_INPUT_KEY)) { + // Migrate preference from {@link Settings#PREF_VOICE_MODE_OBSOLETE} to + // {@link Settings#PREF_VOICE_INPUT_KEY}. + final String voiceModeMain = res.getString(R.string.voice_mode_main); + final String voiceMode = prefs.getString( + Settings.PREF_VOICE_MODE_OBSOLETE, voiceModeMain); + final boolean shouldShowVoiceInputKey = voiceModeMain.equals(voiceMode); + prefs.edit().putBoolean(Settings.PREF_VOICE_INPUT_KEY, shouldShowVoiceInputKey).apply(); + } + // Remove the obsolete preference if exists. + if (prefs.contains(Settings.PREF_VOICE_MODE_OBSOLETE)) { + prefs.edit().remove(Settings.PREF_VOICE_MODE_OBSOLETE).apply(); } return prefs.getBoolean(Settings.PREF_VOICE_INPUT_KEY, true); }