diff options
Diffstat (limited to 'java')
68 files changed, 899 insertions, 505 deletions
diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml index ced4ea284..3270f5a93 100644 --- a/java/res/values-ar/strings.xml +++ b/java/res/values-ar/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"مظهر لوحة المفاتيح"</string> <string name="subtype_en_GB" msgid="88170601942311355">"الإنجليزية (المملكة المتحدة)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"الإنجليزية (الولايات المتحدة)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"بدون لغة"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"بدون لغة (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"أنماط الإدخال المخصصة"</string> + <string name="add_style" msgid="6163126614514489951">"إضافة نمط"</string> + <string name="add" msgid="8299699805688017798">"إضافة"</string> + <string name="remove" msgid="4486081658752944606">"إزالة"</string> + <string name="save" msgid="7646738597196767214">"حفظ"</string> + <string name="subtype_locale" msgid="8576443440738143764">"اللغة"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"التخطيط"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"وضع سهولة الاستخدام"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"إعدادات مدة اهتزاز الضغط على المفاتيح"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"إعدادات مستوى صوت الضغط على المفاتيح"</string> diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml index 91f715b88..6796509ed 100644 --- a/java/res/values-ca/strings.xml +++ b/java/res/values-ca/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Tema del teclat"</string> <string name="subtype_en_GB" msgid="88170601942311355">"Anglès (Regne Unit)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"Anglès (EUA)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Cap idioma"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Cap idioma (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Estils d\'entrada pers."</string> + <string name="add_style" msgid="6163126614514489951">"Afeg. estil"</string> + <string name="add" msgid="8299699805688017798">"Afegeix"</string> + <string name="remove" msgid="4486081658752944606">"Elimina"</string> + <string name="save" msgid="7646738597196767214">"Desa"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Idioma"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Disseny"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Mode d\'estudi d\'usabilitat"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Configuració de la durada de les vibracions per pulsació de tecla"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Configuració del volum de so de pulsació de tecla"</string> diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml index 953ce5564..5f4612e2d 100644 --- a/java/res/values-da/strings.xml +++ b/java/res/values-da/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Tastaturtema"</string> <string name="subtype_en_GB" msgid="88170601942311355">"Engelsk (Storbritannien)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"Engelsk (USA)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Intet sprog"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Ingen sprog (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Tilpasset inputtypografi"</string> + <string name="add_style" msgid="6163126614514489951">"Tilføj typografi"</string> + <string name="add" msgid="8299699805688017798">"Tilføj"</string> + <string name="remove" msgid="4486081658752944606">"Fjern"</string> + <string name="save" msgid="7646738597196767214">"Gem"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Sprog"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Layout"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Tilstand for brugsstudie"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Indstillinger for varighed af vibration ved tastetryk"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Indstillinger for lydstyrke ved tastetryk"</string> diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml index 522af6e2e..4df1b600f 100644 --- a/java/res/values-de/strings.xml +++ b/java/res/values-de/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Tastaturdesign"</string> <string name="subtype_en_GB" msgid="88170601942311355">"Englisch (Großbritannien)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"Englisch (USA)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Keine Sprache"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Keine Sprache (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Benutzerdefinierte Eingabestile"</string> + <string name="add_style" msgid="6163126614514489951">"Stil hinzufügen"</string> + <string name="add" msgid="8299699805688017798">"Hinzufügen"</string> + <string name="remove" msgid="4486081658752944606">"Entfernen"</string> + <string name="save" msgid="7646738597196767214">"Speichern"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Sprache"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Layout"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Modus der Studie zur Benutzerfreundlichkeit"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Einstellungen für Vibrationsdauer bei Tastendruck"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Einstellungen für Tonlautstärke bei Tastendruck"</string> diff --git a/java/res/values-et/strings.xml b/java/res/values-et/strings.xml index 449e76cfd..0e56f9776 100644 --- a/java/res/values-et/strings.xml +++ b/java/res/values-et/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Klaviatuuri teema"</string> <string name="subtype_en_GB" msgid="88170601942311355">"Inglise (UK)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"Inglise (USA)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Keel puudub"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Keel puudub (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Kohandage sisendlaadid"</string> + <string name="add_style" msgid="6163126614514489951">"Lisage laad"</string> + <string name="add" msgid="8299699805688017798">"LIsa"</string> + <string name="remove" msgid="4486081658752944606">"Eemalda"</string> + <string name="save" msgid="7646738597196767214">"Salvesta"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Keel"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Paigutus"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Kasutatavuse uurimisrežiim"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Klahvivajutuse vibratsiooni kestuse seaded"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Klahvivajutuse helitugevuse seaded"</string> diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml index 554e1bf5b..d5b7c5b4c 100644 --- a/java/res/values-fa/strings.xml +++ b/java/res/values-fa/strings.xml @@ -122,23 +122,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"طرح زمینه صفحه کلید"</string> <string name="subtype_en_GB" msgid="88170601942311355">"انگیسی (UK)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"انگیسی (US)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"زبانی موجود نیست"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"هیچ کدام از زبانها (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"سبکهای ورودی سفارشی"</string> + <string name="add_style" msgid="6163126614514489951">"افزودن سبک"</string> + <string name="add" msgid="8299699805688017798">"افزودن"</string> + <string name="remove" msgid="4486081658752944606">"حذف"</string> + <string name="save" msgid="7646738597196767214">"ذخیره"</string> + <string name="subtype_locale" msgid="8576443440738143764">"زبان"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"چیدمان"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"حالت بررسی قابلیت استفاده"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"تنظیمات مدت زمان لرزش فشار کلید"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"تنظیمات میزان صدای فشار کلید"</string> diff --git a/java/res/values-fi/strings.xml b/java/res/values-fi/strings.xml index e11353102..53c0417f8 100644 --- a/java/res/values-fi/strings.xml +++ b/java/res/values-fi/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Näppäimistöteema"</string> <string name="subtype_en_GB" msgid="88170601942311355">"englanti (Iso-Britannia)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"englanti (Yhdysvallat)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Ei kieltä"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Ei kieltä (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Muokatut syöttötyylit"</string> + <string name="add_style" msgid="6163126614514489951">"Lisää tyyli"</string> + <string name="add" msgid="8299699805688017798">"Lisää"</string> + <string name="remove" msgid="4486081658752944606">"Poista"</string> + <string name="save" msgid="7646738597196767214">"Tallenna"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Kieli"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Asettelu"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Käytettävyystutkimustila"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Näppäimenpainalluksen värinän kestoasetukset"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Näppäimenpainalluksen äänenvoimakkuusasetukset"</string> diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml index fc26597f3..18777a384 100644 --- a/java/res/values-fr/strings.xml +++ b/java/res/values-fr/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Thème du clavier"</string> <string name="subtype_en_GB" msgid="88170601942311355">"Anglais (Royaume-Uni)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"Anglais (États-Unis)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Aucune langue"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Pas de langue (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Styles saisie personnalisés"</string> + <string name="add_style" msgid="6163126614514489951">"Ajouter style"</string> + <string name="add" msgid="8299699805688017798">"Ajouter"</string> + <string name="remove" msgid="4486081658752944606">"Supprimer"</string> + <string name="save" msgid="7646738597196767214">"Enregistrer"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Langue"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Clavier"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Mode d\'étude de l\'utilisabilité"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Durée de vibration à chaque pression"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Volume sonore à chaque pression"</string> diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml index 528982039..fa607c725 100644 --- a/java/res/values-hi/strings.xml +++ b/java/res/values-hi/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"कीबोर्ड थीम"</string> <string name="subtype_en_GB" msgid="88170601942311355">"अंग्रेज़ी (यूके)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"अंग्रेज़ी (यूएस)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"कोई भाषा नहीं"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"कोई भाषा नहीं (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"कस्टम इनपुट शैलियां"</string> + <string name="add_style" msgid="6163126614514489951">"शैली जोड़ें"</string> + <string name="add" msgid="8299699805688017798">"जोड़ें"</string> + <string name="remove" msgid="4486081658752944606">"निकालें"</string> + <string name="save" msgid="7646738597196767214">"सहेजें"</string> + <string name="subtype_locale" msgid="8576443440738143764">"भाषा"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"लेआउट"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"उपयोगिता अध्ययन मोड"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"कुंजी-स्पर्श कंपन अवधि सेटिंग"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"कुंजी-स्पर्श ध्वनि वॉल्यूम सेटिंग"</string> diff --git a/java/res/values-hu/strings.xml b/java/res/values-hu/strings.xml index c001eb528..fd86998b3 100644 --- a/java/res/values-hu/strings.xml +++ b/java/res/values-hu/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Billentyűzettéma"</string> <string name="subtype_en_GB" msgid="88170601942311355">"angol (brit)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"angol (amerikai)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Nincs nyelv"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Nincs nyelv (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Egyedi bevitelstílusok"</string> + <string name="add_style" msgid="6163126614514489951">"Új stílus"</string> + <string name="add" msgid="8299699805688017798">"Hozzáadás"</string> + <string name="remove" msgid="4486081658752944606">"Eltávolítás"</string> + <string name="save" msgid="7646738597196767214">"Mentés"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Nyelv"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Elrendezés"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Használhatósági teszt"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Gombnyomás rezgési időtartamának beállításai"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Gombnyomás hangerejének beállításai"</string> diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml index 66428883b..ffc9cca22 100644 --- a/java/res/values-it/strings.xml +++ b/java/res/values-it/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Tema della tastiera"</string> <string name="subtype_en_GB" msgid="88170601942311355">"Inglese (UK)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"Inglese (USA)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Nessuna lingua"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Nessuna lingua (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Stili personalizzati"</string> + <string name="add_style" msgid="6163126614514489951">"Aggiungi stile"</string> + <string name="add" msgid="8299699805688017798">"Aggiungi"</string> + <string name="remove" msgid="4486081658752944606">"Rimuovi"</string> + <string name="save" msgid="7646738597196767214">"Salva"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Lingua"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Layout"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Modalità Studio sull\'usabilità"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Impostazioni durata vibrazione alla pressione di un tasto"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Impostazioni volume audio alla pressione di un tasto"</string> diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index 34f235884..7eb035d67 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"キーボードのテーマ"</string> <string name="subtype_en_GB" msgid="88170601942311355">"英語（英国）"</string> <string name="subtype_en_US" msgid="6160452336634534239">"英語（米国）"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"言語設定なし"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"言語設定なし（QWERTY）"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"カスタム入力スタイル"</string> + <string name="add_style" msgid="6163126614514489951">"スタイル追加"</string> + <string name="add" msgid="8299699805688017798">"追加"</string> + <string name="remove" msgid="4486081658752944606">"削除"</string> + <string name="save" msgid="7646738597196767214">"保存"</string> + <string name="subtype_locale" msgid="8576443440738143764">"言語"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"レイアウト"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"使いやすさの研究モード"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"キー操作バイブの振動時間の設定"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"キー操作音の音量設定"</string> diff --git a/java/res/values-ms/strings.xml b/java/res/values-ms/strings.xml index d131ba8f4..0029752cf 100644 --- a/java/res/values-ms/strings.xml +++ b/java/res/values-ms/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Tema papan kekunci"</string> <string name="subtype_en_GB" msgid="88170601942311355">"Bahasa Inggeris (UK)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"Bahasa Inggeris (AS)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Tiada bahasa"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Tiada bahasa (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Gaya input peribadi"</string> + <string name="add_style" msgid="6163126614514489951">"Tambah gaya"</string> + <string name="add" msgid="8299699805688017798">"Tambah"</string> + <string name="remove" msgid="4486081658752944606">"Alih keluar"</string> + <string name="save" msgid="7646738597196767214">"Simpan"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Bahasa"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Reka Letak"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Mod kajian kebolehgunaan"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Tetapan tempoh getaran tekan kekunci"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Tetapan kelantangan bunyi tekanan kekunci"</string> diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml index 96a9f7c96..08434a5a8 100644 --- a/java/res/values-nb/strings.xml +++ b/java/res/values-nb/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Tastaturtema"</string> <string name="subtype_en_GB" msgid="88170601942311355">"Engelsk (Storbritannia)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"Engelsk (USA)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Ingen språk"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Ingen språk (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Egendefinerte inndata"</string> + <string name="add_style" msgid="6163126614514489951">"Legg til stil"</string> + <string name="add" msgid="8299699805688017798">"Legg til"</string> + <string name="remove" msgid="4486081658752944606">"Fjern"</string> + <string name="save" msgid="7646738597196767214">"Lagre"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Språk"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Oppsett"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Nyttighetsmodus"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Innstillinger for vibrasjonsvarighet ved tastetrykk"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Innstillinger for lydstyrke ved tastetrykk"</string> diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml index 476562c37..ff5cf892f 100644 --- a/java/res/values-nl/strings.xml +++ b/java/res/values-nl/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Toetsenbordthema"</string> <string name="subtype_en_GB" msgid="88170601942311355">"Engels (GB)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"Engels (VS)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Geen taal"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Geen taal (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Aangep. invoerstijlen"</string> + <string name="add_style" msgid="6163126614514489951">"Stijl toev."</string> + <string name="add" msgid="8299699805688017798">"Toevoegen"</string> + <string name="remove" msgid="4486081658752944606">"Verwijderen"</string> + <string name="save" msgid="7646738597196767214">"Opslaan"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Taal"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Lay-out"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Modus voor gebruiksvriendelijkheidsonderzoek"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Instellingen voor trillingsduur bij druk op een toets"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Instellingen voor geluidsvolume bij druk op een toets"</string> diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml index 6ebf932c6..c9185ede3 100644 --- a/java/res/values-pt-rPT/strings.xml +++ b/java/res/values-pt-rPT/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Tema do teclado"</string> <string name="subtype_en_GB" msgid="88170601942311355">"Inglês (RU)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"Inglês (EUA)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Nenhum idioma"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Nenhum idioma (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Estilos entrada pers."</string> + <string name="add_style" msgid="6163126614514489951">"Adic. estilo"</string> + <string name="add" msgid="8299699805688017798">"Adicionar"</string> + <string name="remove" msgid="4486081658752944606">"Remover"</string> + <string name="save" msgid="7646738597196767214">"Guardar"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Idioma"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Esquema"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Modo de estudo da capacidade de utilização"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Definições de duração da vibração ao premir as teclas"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Definições de volume de som ao premir as teclas"</string> diff --git a/java/res/values-uk/strings.xml b/java/res/values-uk/strings.xml index 33e1d4098..23b6c0532 100644 --- a/java/res/values-uk/strings.xml +++ b/java/res/values-uk/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Тема клавіатури"</string> <string name="subtype_en_GB" msgid="88170601942311355">"Англійська (Великобританія)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"Англійська (США)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Мову не вибрано"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Немає мови (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Стилі спец. введення"</string> + <string name="add_style" msgid="6163126614514489951">"Додати стиль"</string> + <string name="add" msgid="8299699805688017798">"Додати"</string> + <string name="remove" msgid="4486081658752944606">"Видалити"</string> + <string name="save" msgid="7646738597196767214">"Зберегти"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Мова"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Макет"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Режим вивчення зручності у використанні"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Налаштування тривалості вібрації під час натискання клавіші"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Налаштування гучності звуку під час натискання клавіші"</string> diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml index fd4364f74..10e2b167c 100644 --- a/java/res/values-vi/strings.xml +++ b/java/res/values-vi/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Chủ đề bàn phím"</string> <string name="subtype_en_GB" msgid="88170601942311355">"Tiếng Anh (Anh)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"Tiếng Anh (Mỹ)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Không có ngôn ngữ nào"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Không có ngôn ngữ (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Kiểu nhập tùy chỉnh"</string> + <string name="add_style" msgid="6163126614514489951">"Thêm kiểu"</string> + <string name="add" msgid="8299699805688017798">"Thêm"</string> + <string name="remove" msgid="4486081658752944606">"Xóa"</string> + <string name="save" msgid="7646738597196767214">"Lưu"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Ngôn ngữ"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Bố cục"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Chế độ nghiên cứu tính khả dụng"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Cài đặt thời gian rung khi nhấn phím"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Cài đặt âm lượng khi nhấn phím"</string> diff --git a/java/res/values-zu/strings.xml b/java/res/values-zu/strings.xml index 47ddc0c6f..c14c1bcd4 100644 --- a/java/res/values-zu/strings.xml +++ b/java/res/values-zu/strings.xml @@ -118,23 +118,15 @@ <string name="keyboard_layout" msgid="8451164783510487501">"Indikimba yekhibhodi"</string> <string name="subtype_en_GB" msgid="88170601942311355">"i-English(UK)"</string> <string name="subtype_en_US" msgid="6160452336634534239">"i-English (US)"</string> - <!-- no translation found for subtype_no_language (141420857808801746) --> - <skip /> + <string name="subtype_no_language" msgid="141420857808801746">"Akunalimi"</string> <string name="subtype_no_language_qwerty" msgid="2956121451616633133">"Akunalimi (QWERTY)"</string> - <!-- no translation found for custom_input_styles_title (8429952441821251512) --> - <skip /> - <!-- no translation found for add_style (6163126614514489951) --> - <skip /> - <!-- no translation found for add (8299699805688017798) --> - <skip /> - <!-- no translation found for remove (4486081658752944606) --> - <skip /> - <!-- no translation found for save (7646738597196767214) --> - <skip /> - <!-- no translation found for subtype_locale (8576443440738143764) --> - <skip /> - <!-- no translation found for keyboard_layout_set (4309233698194565609) --> - <skip /> + <string name="custom_input_styles_title" msgid="8429952441821251512">"Izitayela zokufaka ngokwezifiso"</string> + <string name="add_style" msgid="6163126614514489951">"Engeza isitayela"</string> + <string name="add" msgid="8299699805688017798">"Engeza"</string> + <string name="remove" msgid="4486081658752944606">"Khipha"</string> + <string name="save" msgid="7646738597196767214">"Londoloza"</string> + <string name="subtype_locale" msgid="8576443440738143764">"Ulimi"</string> + <string name="keyboard_layout_set" msgid="4309233698194565609">"Isakhiwo"</string> <string name="prefs_usability_study_mode" msgid="1261130555134595254">"Imodi yesitadi yokusebenziseka"</string> <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Izilungiselelo ze-keypress vibration duraton"</string> <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Izilungiselelo zevolumu yomsindo wekeypress"</string> diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 99b80d0b6..37f073675 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -153,6 +153,7 @@ <item>qwertz</item> <item>azerty</item> <item>dvorak</item> + <item>colemak</item> </string-array> <!-- Predefined keyboard layout display names --> <string-array name="predefined_layout_display_names"> @@ -160,6 +161,7 @@ <item>QWERTZ</item> <item>AZERTY</item> <item>Dvorak</item> + <item>Colemak</item> </string-array> <!-- Description for generic subtype that has predefined layout. The string resource name must be "subtype_generic_<layout name>". --> @@ -167,6 +169,7 @@ <string name="subtype_generic_qwertz">%s (QWERTZ)</string> <string name="subtype_generic_azerty">%s (AZERTY)</string> <string name="subtype_generic_dvorak">%s (Dvorak)</string> + <string name="subtype_generic_colemak">%s (Colemak)</string> <!-- dictionary pack package name /settings activity (for shared prefs and settings) --> <string name="dictionary_pack_package_name">com.google.android.inputmethod.latin.dictionarypack</string> diff --git a/java/res/xml-sw600dp/key_colemak_colon.xml b/java/res/xml-sw600dp/key_colemak_colon.xml new file mode 100644 index 000000000..a5a6e9526 --- /dev/null +++ b/java/res/xml-sw600dp/key_colemak_colon.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <Key + latin:keyLabel=":" + latin:keyHintLabel=";" + latin:moreKeys=";" + latin:keyStyle="hasShiftedLetterHintStyle" /> +</merge> diff --git a/java/res/xml-sw600dp/key_f1.xml b/java/res/xml-sw600dp/key_f1.xml index e477d3758..faf087558 100644 --- a/java/res/xml-sw600dp/key_f1.xml +++ b/java/res/xml-sw600dp/key_f1.xml @@ -23,13 +23,7 @@ > <switch> <case - latin:mode="email" - > - <Key - latin:keyStyle="comKeyStyle" /> - </case> - <case - latin:mode="url" + latin:mode="email|url" > <Key latin:keyStyle="comKeyStyle" /> diff --git a/java/res/xml-sw600dp/key_shortcut.xml b/java/res/xml-sw600dp/key_shortcut.xml index f8cbdf6b6..87fc75cd5 100644 --- a/java/res/xml-sw600dp/key_shortcut.xml +++ b/java/res/xml-sw600dp/key_shortcut.xml @@ -29,24 +29,21 @@ <Key latin:keyStyle="shortcutKeyStyle" latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="!text/settings_as_more_key" - latin:keyWidth="fillBoth" /> + latin:moreKeys="!text/settings_as_more_key" /> </case> <case latin:shortcutKeyEnabled="true" latin:clobberSettingsKey="true" > <Key - latin:keyStyle="shortcutKeyStyle" - latin:keyWidth="fillBoth" /> + latin:keyStyle="shortcutKeyStyle" /> </case> <case latin:shortcutKeyEnabled="false" latin:clobberSettingsKey="false" > <Key - latin:keyStyle="settingsKeyStyle" - latin:keyWidth="fillBoth" /> + latin:keyStyle="settingsKeyStyle" /> </case> <!-- shortcutKeyEnabled="false" clobberSettingsKey="true" --> <default> diff --git a/java/res/xml-sw600dp/key_space.xml b/java/res/xml-sw600dp/key_space.xml index 4670142cc..4e1e15b55 100644 --- a/java/res/xml-sw600dp/key_space.xml +++ b/java/res/xml-sw600dp/key_space.xml @@ -21,9 +21,6 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <Spacer - latin:keyWidth="0dp" - latin:keyXPos="30.750%p" /> <switch> <case latin:languageCode="fa" diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml index bf392a33c..884cea1b6 100644 --- a/java/res/xml-sw600dp/key_styles_common.xml +++ b/java/res/xml-sw600dp/key_styles_common.xml @@ -98,7 +98,7 @@ latin:code="!code/key_shortcut" latin:keyIcon="!icon/shortcut_key" latin:keyIconDisabled="!icon/shortcut_key_disabled" - latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" + latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style latin:styleName="languageSwitchKeyStyle" @@ -110,7 +110,7 @@ latin:styleName="settingsKeyStyle" latin:code="!code/key_settings" latin:keyIcon="!icon/settings_key" - latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" + latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <switch> <case diff --git a/java/res/xml-sw600dp/row_dvorak4.xml b/java/res/xml-sw600dp/row_dvorak4.xml index 7d365883a..14a5fd81d 100644 --- a/java/res/xml-sw600dp/row_dvorak4.xml +++ b/java/res/xml-sw600dp/row_dvorak4.xml @@ -32,15 +32,15 @@ <include latin:keyboardLayout="@xml/key_f1" /> <include + latin:keyXPos="30.750%p" latin:keyboardLayout="@xml/key_space" /> <include latin:keyboardLayout="@xml/key_question_exclamation" /> <include latin:keyboardLayout="@xml/key_dash" /> - <Spacer - latin:keyXPos="-10.00%p" - latin:keyWidth="0%p" /> <include + latin:keyXPos="-10.00%p" + latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> </merge> diff --git a/java/res/xml-sw600dp/row_hebrew4.xml b/java/res/xml-sw600dp/row_hebrew4.xml new file mode 100644 index 000000000..536b65397 --- /dev/null +++ b/java/res/xml-sw600dp/row_hebrew4.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <Row + latin:keyWidth="8.9%p" + > + <Key + latin:keyStyle="toSymbolKeyStyle" + latin:keyWidth="13.0%p" /> + <Key + latin:keyStyle="tabKeyStyle" /> + <include + latin:keyboardLayout="@xml/key_f1" /> + <include + latin:keyboardLayout="@xml/key_space" /> + <include + latin:keyboardLayout="@xml/keys_comma_period" /> + <include + latin:keyXPos="-10.0%p" + latin:keyWidth="fillRight" + latin:keyboardLayout="@xml/key_shortcut" /> + </Row> +</merge> diff --git a/java/res/xml-sw600dp/row_qwerty4.xml b/java/res/xml-sw600dp/row_qwerty4.xml index 95b328b38..76ac3a0d0 100644 --- a/java/res/xml-sw600dp/row_qwerty4.xml +++ b/java/res/xml-sw600dp/row_qwerty4.xml @@ -32,26 +32,15 @@ <include latin:keyboardLayout="@xml/key_f1" /> <include + latin:keyXPos="30.750%p" latin:keyboardLayout="@xml/key_space" /> - <switch> - <case - latin:languageCode="iw" - > - <include - latin:keyboardLayout="@xml/keys_comma_period" /> - </case> - <!-- not languageCode="iw" --> - <default> - <include - latin:keyboardLayout="@xml/key_apostrophe" /> - <include - latin:keyboardLayout="@xml/key_dash" /> - </default> - </switch> - <Spacer - latin:keyXPos="-10.00%p" - latin:keyWidth="0%p" /> <include + latin:keyboardLayout="@xml/key_apostrophe" /> + <include + latin:keyboardLayout="@xml/key_dash" /> + <include + latin:keyXPos="-10.00%p" + latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> </merge> diff --git a/java/res/xml-sw600dp/row_symbols4.xml b/java/res/xml-sw600dp/row_symbols4.xml index 9b6daab36..d294e20cf 100644 --- a/java/res/xml-sw600dp/row_symbols4.xml +++ b/java/res/xml-sw600dp/row_symbols4.xml @@ -32,16 +32,16 @@ <Key latin:keyLabel="\@" /> <include + latin:keyXPos="30.750%p" latin:keyboardLayout="@xml/key_space" /> <Key latin:keyLabel=""" latin:moreKeys="!text/more_keys_for_tablet_double_quote" /> <Key latin:keyLabel="_" /> - <Spacer - latin:keyXPos="-10.00%p" - latin:keyWidth="0%p" /> <include + latin:keyXPos="-10.0%p" + latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> </merge> diff --git a/java/res/xml-sw600dp/row_symbols_shift4.xml b/java/res/xml-sw600dp/row_symbols_shift4.xml index 7823561eb..3a78c7200 100644 --- a/java/res/xml-sw600dp/row_symbols_shift4.xml +++ b/java/res/xml-sw600dp/row_symbols_shift4.xml @@ -30,11 +30,11 @@ <Key latin:keyStyle="tabKeyStyle" /> <include + latin:keyXPos="30.750%p" latin:keyboardLayout="@xml/key_space" /> - <Spacer - latin:keyXPos="-10.00%p" - latin:keyWidth="0%p" /> <include + latin:keyXPos="-10.00%p" + latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> </merge> diff --git a/java/res/xml-sw600dp/rows_colemak.xml b/java/res/xml-sw600dp/rows_colemak.xml new file mode 100644 index 000000000..aada5eb7a --- /dev/null +++ b/java/res/xml-sw600dp/rows_colemak.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/key_styles_common" /> + <Row + latin:keyWidth="8.5%p" + > + <include + latin:keyboardLayout="@xml/rowkeys_colemak1" + latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> + <include + latin:keyboardLayout="@xml/key_colemak_colon" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillBoth" /> + </Row> + <Row + latin:keyWidth="8.5%p" + > + <include + latin:keyboardLayout="@xml/rowkeys_colemak2" + latin:keyXPos="4.5%p" /> + <Key + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillBoth" /> + </Row> + <Row + latin:keyWidth="8.5%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="10.0%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_colemak3" /> + <include + latin:keyboardLayout="@xml/keys_comma_period" /> + <include + latin:keyboardLayout="@xml/key_smiley" + latin:keyXPos="-8.5%p" + latin:keyWidth="fillRight" /> + </Row> + <include + latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml index d6861e8e4..521473f63 100644 --- a/java/res/xml-sw600dp/rows_hebrew.xml +++ b/java/res/xml-sw600dp/rows_hebrew.xml @@ -58,5 +58,5 @@ latin:keyWidth="fillRight" /> </Row> <include - latin:keyboardLayout="@xml/row_qwerty4" /> + latin:keyboardLayout="@xml/row_hebrew4" /> </merge> diff --git a/java/res/xml-sw600dp/rows_hindi.xml b/java/res/xml-sw600dp/rows_hindi.xml index 6c98e080e..f46c1debb 100644 --- a/java/res/xml-sw600dp/rows_hindi.xml +++ b/java/res/xml-sw600dp/rows_hindi.xml @@ -38,7 +38,7 @@ > <include latin:keyboardLayout="@xml/rowkeys_hindi2" - latin:keyXPos="4.500%p" /> + latin:keyXPos="4.5%p" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -54,7 +54,9 @@ <include latin:keyboardLayout="@xml/keys_comma_period" /> <include - latin:keyboardLayout="@xml/key_smiley" /> + latin:keyboardLayout="@xml/key_smiley" + latin:keyXPos="-7.5%p" + latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw600dp/rows_nordic.xml b/java/res/xml-sw600dp/rows_nordic.xml index 3a8aa1d33..57104fa7d 100644 --- a/java/res/xml-sw600dp/rows_nordic.xml +++ b/java/res/xml-sw600dp/rows_nordic.xml @@ -55,7 +55,7 @@ latin:keyboardLayout="@xml/keys_comma_period" /> <include latin:keyboardLayout="@xml/key_smiley" - latin:keyXPos="-9.0%p" + latin:keyXPos="-7.6%p" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml index 3fda2aa13..04d295336 100644 --- a/java/res/xml-sw600dp/rows_number_normal.xml +++ b/java/res/xml-sw600dp/rows_number_normal.xml @@ -135,8 +135,7 @@ latin:keyLabel="9" latin:keyStyle="numKeyStyle" /> <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> - <Spacer - latin:keyWidth="0%p" /> + <Spacer /> </Row> <Row> <Key @@ -155,10 +154,9 @@ <Key latin:keyLabel="#" latin:keyStyle="numKeyStyle" /> - <Spacer - latin:keyXPos="-11.00%p" - latin:keyWidth="0%p" /> <include + latin:keyXPos="-11.0%p" + latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> </merge> diff --git a/java/res/xml-sw600dp/rows_number_password.xml b/java/res/xml-sw600dp/rows_number_password.xml index 59279fb3b..2a2c33d93 100644 --- a/java/res/xml-sw600dp/rows_number_password.xml +++ b/java/res/xml-sw600dp/rows_number_password.xml @@ -62,8 +62,7 @@ <Key latin:keyStyle="num9KeyStyle" /> <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> - <Spacer - latin:keyWidth="0%p" /> + <Spacer /> </Row> <Row> <Key @@ -72,10 +71,9 @@ <Key latin:keyStyle="num0KeyStyle" latin:keyXPos="42.50%p"/> - <Spacer - latin:keyXPos="-11.00%p" - latin:keyWidth="0%p" /> <include + latin:keyXPos="-11.00%p" + latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> </merge> diff --git a/java/res/xml-sw600dp/rows_phone.xml b/java/res/xml-sw600dp/rows_phone.xml index e8926936f..687cadb87 100644 --- a/java/res/xml-sw600dp/rows_phone.xml +++ b/java/res/xml-sw600dp/rows_phone.xml @@ -104,8 +104,7 @@ <Key latin:keyStyle="num9KeyStyle" /> <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> - <Spacer - latin:keyWidth="0%p" /> + <Spacer /> </Row> <Row> <Key @@ -123,10 +122,9 @@ <Key latin:keyLabel="#" latin:keyStyle="numKeyStyle" /> - <Spacer - latin:keyXPos="-11.00%p" - latin:keyWidth="0%p" /> <include + latin:keyXPos="-11.0%p" + latin:keyWidth="fillRight" latin:keyboardLayout="@xml/key_shortcut" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/key_shortcut.xml b/java/res/xml-sw768dp/key_shortcut.xml new file mode 100644 index 000000000..905270599 --- /dev/null +++ b/java/res/xml-sw768dp/key_shortcut.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <switch> + <case + latin:shortcutKeyEnabled="true" + > + <Key + latin:keyStyle="shortcutKeyStyle" /> + </case> + </switch> +</merge> diff --git a/java/res/xml-sw768dp/key_space.xml b/java/res/xml-sw768dp/key_space.xml index f4d048006..36326c437 100644 --- a/java/res/xml-sw768dp/key_space.xml +++ b/java/res/xml-sw768dp/key_space.xml @@ -21,9 +21,6 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <Spacer - latin:keyWidth="0dp" - latin:keyXPos="31.250%p" /> <switch> <case latin:languageCode="fa" diff --git a/java/res/xml-sw768dp/key_styles_common.xml b/java/res/xml-sw768dp/key_styles_common.xml index 6cb160b6a..2577e1651 100644 --- a/java/res/xml-sw768dp/key_styles_common.xml +++ b/java/res/xml-sw768dp/key_styles_common.xml @@ -97,13 +97,13 @@ latin:code="!code/key_shortcut" latin:keyIcon="!icon/shortcut_key" latin:keyIconDisabled="!icon/shortcut_key_disabled" - latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" + latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style latin:styleName="settingsKeyStyle" latin:code="!code/key_settings" latin:keyIcon="!icon/settings_key" - latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" + latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <switch> <case diff --git a/java/res/xml-sw768dp/row_dvorak4.xml b/java/res/xml-sw768dp/row_dvorak4.xml index b98ce8490..251b4f536 100644 --- a/java/res/xml-sw768dp/row_dvorak4.xml +++ b/java/res/xml-sw768dp/row_dvorak4.xml @@ -26,26 +26,19 @@ > <include latin:keyboardLayout="@xml/key_settings" /> - <Spacer - latin:keyXPos="15.157%p" - latin:keyWidth="0%p" /> <include + latin:keyXPos="15.157%p" latin:keyboardLayout="@xml/keys_f1f2" /> <include + latin:keyXPos="31.250%p" latin:keyboardLayout="@xml/key_space" /> <include latin:keyboardLayout="@xml/key_question_exclamation" /> <include latin:keyboardLayout="@xml/key_dash" /> - <switch> - <case - latin:shortcutKeyEnabled="true" - > - <Key - latin:keyStyle="shortcutKeyStyle" - latin:keyXPos="-8.047%p" - latin:keyWidth="fillRight" /> - </case> - </switch> + <include + latin:keyXPos="-8.047%p" + latin:keyWidth="fillRight" + latin:keyboardLayout="@xml/key_shortcut" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/row_hebrew4.xml b/java/res/xml-sw768dp/row_hebrew4.xml new file mode 100644 index 000000000..8ec7ea7b4 --- /dev/null +++ b/java/res/xml-sw768dp/row_hebrew4.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <Row + latin:keyWidth="8.047%p" + > + <include + latin:keyboardLayout="@xml/key_settings" /> + <include + latin:keyXPos="15.157%p" + latin:keyboardLayout="@xml/keys_f1f2" /> + <include + latin:keyboardLayout="@xml/key_space" /> + <include + latin:keyboardLayout="@xml/keys_comma_period" /> + <include + latin:keyXPos="-8.047%p" + latin:keyWidth="fillRight" + latin:keyboardLayout="@xml/key_shortcut" /> + </Row> +</merge> diff --git a/java/res/xml-sw768dp/row_qwerty4.xml b/java/res/xml-sw768dp/row_qwerty4.xml index f6ad3fd46..0cf964f50 100644 --- a/java/res/xml-sw768dp/row_qwerty4.xml +++ b/java/res/xml-sw768dp/row_qwerty4.xml @@ -26,36 +26,19 @@ > <include latin:keyboardLayout="@xml/key_settings" /> - <Spacer - latin:keyXPos="15.157%p" - latin:keyWidth="0%p" /> <include + latin:keyXPos="15.157%p" latin:keyboardLayout="@xml/keys_f1f2" /> <include + latin:keyXPos="31.250%p" latin:keyboardLayout="@xml/key_space" /> - <switch> - <case - latin:languageCode="iw" - > - <include - latin:keyboardLayout="@xml/keys_comma_period" /> - </case> - <default> - <include - latin:keyboardLayout="@xml/key_apostrophe" /> - <include - latin:keyboardLayout="@xml/key_dash" /> - </default> - </switch> - <switch> - <case - latin:shortcutKeyEnabled="true" - > - <Key - latin:keyStyle="shortcutKeyStyle" - latin:keyXPos="-8.047%p" - latin:keyWidth="fillRight" /> - </case> - </switch> + <include + latin:keyboardLayout="@xml/key_apostrophe" /> + <include + latin:keyboardLayout="@xml/key_dash" /> + <include + latin:keyXPos="-8.047%p" + latin:keyWidth="fillRight" + latin:keyboardLayout="@xml/key_shortcut" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/row_symbols4.xml b/java/res/xml-sw768dp/row_symbols4.xml index 29845aae0..167fc5e1d 100644 --- a/java/res/xml-sw768dp/row_symbols4.xml +++ b/java/res/xml-sw768dp/row_symbols4.xml @@ -32,21 +32,16 @@ <Key latin:keyLabel="\@" /> <include + latin:keyXPos="31.250%p" latin:keyboardLayout="@xml/key_space" /> <Key latin:keyLabel=""" latin:moreKeys="!text/more_keys_for_tablet_double_quote" /> <Key latin:keyLabel="_" /> - <switch> - <case - latin:shortcutKeyEnabled="true" - > - <Key - latin:keyStyle="shortcutKeyStyle" - latin:keyXPos="-8.047%p" - latin:keyWidth="fillRight" /> - </case> - </switch> + <include + latin:keyXPos="-8.047%p" + latin:keyWidth="fillRight" + latin:keyboardLayout="@xml/key_shortcut" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/row_symbols_shift4.xml b/java/res/xml-sw768dp/row_symbols_shift4.xml index 6828fdb78..683ec439f 100644 --- a/java/res/xml-sw768dp/row_symbols_shift4.xml +++ b/java/res/xml-sw768dp/row_symbols_shift4.xml @@ -27,16 +27,11 @@ <include latin:keyboardLayout="@xml/key_settings" /> <include + latin:keyXPos="31.250%p" latin:keyboardLayout="@xml/key_space" /> - <switch> - <case - latin:shortcutKeyEnabled="true" - > - <Key - latin:keyStyle="shortcutKeyStyle" - latin:keyXPos="-8.047%p" - latin:keyWidth="fillRight" /> - </case> - </switch> + <include + latin:keyXPos="-8.047%p" + latin:keyWidth="fillRight" + latin:keyboardLayout="@xml/key_shortcut" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/rows_colemak.xml b/java/res/xml-sw768dp/rows_colemak.xml new file mode 100644 index 000000000..01ebead3e --- /dev/null +++ b/java/res/xml-sw768dp/rows_colemak.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, 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. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/key_styles_common" /> + <Row + latin:keyWidth="8.282%p" + > + <Key + latin:keyStyle="tabKeyStyle" + latin:keyLabelFlags="alignLeft" + latin:keyWidth="7.969%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_colemak1" + latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> + <include + latin:keyboardLayout="@xml/key_colemak_colon" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillBoth" /> + </Row> + <Row + latin:keyWidth="8.125%p" + > + <Key + latin:keyStyle="toSymbolKeyStyle" + latin:keyLabelFlags="alignLeft" + latin:keyWidth="10.167%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_colemak2" /> + <Key + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillBoth" /> + </Row> + <Row + latin:keyWidth="8.047%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="13.829%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_colemak3" /> + <include + latin:keyboardLayout="@xml/keys_comma_period" /> + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="fillBoth" /> + </Row> + <include + latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> diff --git a/java/res/xml-sw768dp/rows_hebrew.xml b/java/res/xml-sw768dp/rows_hebrew.xml index e70f45071..beb59b42a 100644 --- a/java/res/xml-sw768dp/rows_hebrew.xml +++ b/java/res/xml-sw768dp/rows_hebrew.xml @@ -61,5 +61,5 @@ latin:keyXPos="13.829%p" /> </Row> <include - latin:keyboardLayout="@xml/row_qwerty4" /> + latin:keyboardLayout="@xml/row_hebrew4" /> </merge> diff --git a/java/res/xml-sw768dp/rows_number_normal.xml b/java/res/xml-sw768dp/rows_number_normal.xml index 0d75a37d2..42697cec1 100644 --- a/java/res/xml-sw768dp/rows_number_normal.xml +++ b/java/res/xml-sw768dp/rows_number_normal.xml @@ -137,8 +137,7 @@ latin:keyLabel="9" latin:keyStyle="numKeyStyle" /> <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> - <Spacer - latin:keyWidth="0%p" /> + <Spacer /> </Row> <Row> <include @@ -157,20 +156,9 @@ <Key latin:keyLabel="#" latin:keyStyle="numKeyStyle" /> - <switch> - <case - latin:shortcutKeyEnabled="true" - > - <Key - latin:keyStyle="shortcutKeyStyle" - latin:keyXPos="-8.047%p" - latin:keyWidth="fillRight" /> - </case> - <default> - <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> - <Spacer - latin:keyWidth="0%p" /> - </default> - </switch> + <include + latin:keyXPos="-8.047%p" + latin:keyWidth="fillRight" + latin:keyboardLayout="@xml/key_shortcut" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/rows_number_password.xml b/java/res/xml-sw768dp/rows_number_password.xml index 8acfac6ff..cfa221491 100644 --- a/java/res/xml-sw768dp/rows_number_password.xml +++ b/java/res/xml-sw768dp/rows_number_password.xml @@ -64,16 +64,16 @@ <Key latin:keyStyle="num9KeyStyle" /> <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> - <Spacer - latin:keyWidth="0%p" /> + <Spacer /> </Row> <Row> - <Spacer - latin:keyXPos="32.076%p" /> + <include + latin:keyboardLayout="@xml/key_settings" + latin:keyWidth="8.047%p" /> <Key + latin:keyXPos="45.326%p" latin:keyStyle="num0KeyStyle" /> <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> - <Spacer - latin:keyWidth="0%p" /> + <Spacer /> </Row> </merge> diff --git a/java/res/xml-sw768dp/rows_phone.xml b/java/res/xml-sw768dp/rows_phone.xml index 216fbedfb..b3b3521a9 100644 --- a/java/res/xml-sw768dp/rows_phone.xml +++ b/java/res/xml-sw768dp/rows_phone.xml @@ -106,8 +106,7 @@ <Key latin:keyStyle="num9KeyStyle" /> <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> - <Spacer - latin:keyWidth="0%p" /> + <Spacer /> </Row> <Row> <include @@ -125,20 +124,9 @@ <Key latin:keyLabel="#" latin:keyStyle="numKeyStyle" /> - <switch> - <case - latin:shortcutKeyEnabled="true" - > - <Key - latin:keyStyle="shortcutKeyStyle" - latin:keyXPos="-8.047%p" - latin:keyWidth="fillRight" /> - </case> - <default> - <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> - <Spacer - latin:keyWidth="0%p" /> - </default> - </switch> + <include + latin:keyXPos="-8.047%p" + latin:keyWidth="fillRight" + latin:keyboardLayout="@xml/key_shortcut" /> </Row> </merge> diff --git a/java/res/xml-sw768dp/rows_thai.xml b/java/res/xml-sw768dp/rows_thai.xml index cc77f8bc5..c7720c9c5 100644 --- a/java/res/xml-sw768dp/rows_thai.xml +++ b/java/res/xml-sw768dp/rows_thai.xml @@ -28,7 +28,7 @@ > <include latin:keyboardLayout="@xml/rowkeys_thai1" - latin:keyXPos="11.508%p"/> + latin:keyXPos="11.508%p" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillBoth"/> diff --git a/java/res/xml/kbd_colemak.xml b/java/res/xml/kbd_colemak.xml new file mode 100644 index 000000000..ee1d5e86e --- /dev/null +++ b/java/res/xml/kbd_colemak.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/rows_colemak" /> +</Keyboard> diff --git a/java/res/xml/key_colemak_colon.xml b/java/res/xml/key_colemak_colon.xml new file mode 100644 index 000000000..307b4ebca --- /dev/null +++ b/java/res/xml/key_colemak_colon.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <switch> + <case + latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" + > + <Key + latin:keyLabel=";" + latin:keyHintLabel="0" + latin:additionalMoreKeys="0" /> + </case> + <default> + <Key + latin:keyLabel=":" + latin:keyHintLabel="0" + latin:additionalMoreKeys="0" + latin:moreKeys=";" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/key_space.xml b/java/res/xml/key_space.xml index c47407dc7..02ee42fd2 100644 --- a/java/res/xml/key_space.xml +++ b/java/res/xml/key_space.xml @@ -21,9 +21,6 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <Spacer - latin:keyWidth="0dp" - latin:keyXPos="25%p" /> <switch> <case latin:languageCode="fa" diff --git a/java/res/xml/keyboard_layout_set_colemak.xml b/java/res/xml/keyboard_layout_set_colemak.xml new file mode 100644 index 000000000..c18f13225 --- /dev/null +++ b/java/res/xml/keyboard_layout_set_colemak.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> + +<KeyboardLayoutSet + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <Element + latin:elementName="alphabet" + latin:elementKeyboard="@xml/kbd_colemak" + latin:enableProximityCharsCorrection="true" /> + <Element + latin:elementName="symbols" + latin:elementKeyboard="@xml/kbd_10_10_7_symbols" /> + <Element + latin:elementName="symbolsShifted" + latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" /> + <Element + latin:elementName="phone" + latin:elementKeyboard="@xml/kbd_phone" /> + <Element + latin:elementName="phoneSymbols" + latin:elementKeyboard="@xml/kbd_phone_symbols" /> + <Element + latin:elementName="number" + latin:elementKeyboard="@xml/kbd_number" /> +</KeyboardLayoutSet> diff --git a/java/res/xml/row_dvorak4.xml b/java/res/xml/row_dvorak4.xml index 7b9a59cde..f81fb007b 100644 --- a/java/res/xml/row_dvorak4.xml +++ b/java/res/xml/row_dvorak4.xml @@ -78,6 +78,7 @@ </default> </switch> <include + latin:keyXPos="25%p" latin:keyboardLayout="@xml/key_space" /> <Key latin:keyLabel="z" diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml index 361a2c3ef..678034960 100644 --- a/java/res/xml/row_qwerty4.xml +++ b/java/res/xml/row_qwerty4.xml @@ -30,6 +30,7 @@ <include latin:keyboardLayout="@xml/key_f1" /> <include + latin:keyXPos="25%p" latin:keyboardLayout="@xml/key_space" /> <Key latin:keyStyle="punctuationKeyStyle" /> diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml index a92d55a76..150ad486c 100644 --- a/java/res/xml/row_symbols4.xml +++ b/java/res/xml/row_symbols4.xml @@ -44,6 +44,7 @@ </default> </switch> <include + latin:keyXPos="25%p" latin:keyboardLayout="@xml/key_space" /> <Key latin:keyStyle="punctuationKeyStyle" /> diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml index 6608b7795..1bfb5ecd1 100644 --- a/java/res/xml/row_symbols_shift4.xml +++ b/java/res/xml/row_symbols_shift4.xml @@ -36,6 +36,7 @@ latin:keyLabel="„" latin:backgroundType="functional" /> <include + latin:keyXPos="25%p" latin:keyboardLayout="@xml/key_space" /> <!-- U+2026: "…" HORIZONTAL ELLIPSIS --> <Key diff --git a/java/res/xml/rowkeys_colemak1.xml b/java/res/xml/rowkeys_colemak1.xml new file mode 100644 index 000000000..f1c30756b --- /dev/null +++ b/java/res/xml/rowkeys_colemak1.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <Key + latin:keyLabel="q" + latin:keyHintLabel="1" + latin:additionalMoreKeys="1" /> + <Key + latin:keyLabel="w" + latin:keyHintLabel="2" + latin:additionalMoreKeys="2" + latin:moreKeys="!text/more_keys_for_w" /> + <Key + latin:keyLabel="f" + latin:keyHintLabel="3" + latin:additionalMoreKeys="3" /> + <Key + latin:keyLabel="p" + latin:keyHintLabel="4" + latin:additionalMoreKeys="4" /> + <Key + latin:keyLabel="g" + latin:keyHintLabel="5" + latin:additionalMoreKeys="5" + latin:moreKeys="!text/more_keys_for_g" /> + <Key + latin:keyLabel="j" + latin:keyHintLabel="6" + latin:additionalMoreKeys="6" + latin:moreKeys="!text/more_keys_for_j" /> + <Key + latin:keyLabel="l" + latin:keyHintLabel="7" + latin:additionalMoreKeys="7" + latin:moreKeys="!text/more_keys_for_l" /> + <Key + latin:keyLabel="u" + latin:keyHintLabel="8" + latin:additionalMoreKeys="8" + latin:moreKeys="!text/more_keys_for_u" /> + <Key + latin:keyLabel="y" + latin:keyHintLabel="9" + latin:additionalMoreKeys="9" + latin:moreKeys="!text/more_keys_for_y" /> +</merge> diff --git a/java/res/xml/rowkeys_colemak2.xml b/java/res/xml/rowkeys_colemak2.xml new file mode 100644 index 000000000..f73d7e95f --- /dev/null +++ b/java/res/xml/rowkeys_colemak2.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <Key + latin:keyLabel="a" + latin:moreKeys="!text/more_keys_for_a" /> + <Key + latin:keyLabel="r" + latin:moreKeys="!text/more_keys_for_r" /> + <Key + latin:keyLabel="s" + latin:moreKeys="!text/more_keys_for_s" /> + <Key + latin:keyLabel="t" + latin:moreKeys="!text/more_keys_for_t" /> + <Key + latin:keyLabel="d" + latin:moreKeys="!text/more_keys_for_d" /> + <Key + latin:keyLabel="h" + latin:moreKeys="!text/more_keys_for_h" /> + <Key + latin:keyLabel="n" + latin:moreKeys="!text/more_keys_for_n" /> + <Key + latin:keyLabel="e" + latin:moreKeys="!text/more_keys_for_e" /> + <Key + latin:keyLabel="i" + latin:moreKeys="!text/more_keys_for_i" /> + <Key + latin:keyLabel="o" + latin:moreKeys="!text/more_keys_for_o" /> +</merge> diff --git a/java/res/xml/rowkeys_colemak3.xml b/java/res/xml/rowkeys_colemak3.xml new file mode 100644 index 000000000..f0f915142 --- /dev/null +++ b/java/res/xml/rowkeys_colemak3.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <Key + latin:keyLabel="z" + latin:moreKeys="!text/more_keys_for_z" /> + <Key + latin:keyLabel="x" /> + <Key + latin:keyLabel="c" + latin:moreKeys="!text/more_keys_for_c" /> + <Key + latin:keyLabel="v" + latin:moreKeys="!text/more_keys_for_v" /> + <Key + latin:keyLabel="b" /> + <Key + latin:keyLabel="k" + latin:moreKeys="!text/more_keys_for_k" /> + <Key + latin:keyLabel="m" /> +</merge> diff --git a/java/res/xml/rows_colemak.xml b/java/res/xml/rows_colemak.xml new file mode 100644 index 000000000..d74c2c9ec --- /dev/null +++ b/java/res/xml/rows_colemak.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/key_styles_common" /> + <Row + latin:keyWidth="10%p" + > + <include + latin:keyboardLayout="@xml/rowkeys_colemak1" /> + <include + latin:keyboardLayout="@xml/key_colemak_colon" /> + </Row> + <Row + latin:keyWidth="10%p" + > + <include + latin:keyboardLayout="@xml/rowkeys_colemak2" /> + </Row> + <Row + latin:keyWidth="10%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="15%p" + latin:visualInsetsRight="1%p" /> + <include + latin:keyboardLayout="@xml/rowkeys_colemak3" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" + latin:visualInsetsLeft="1%p" /> + </Row> + <include + latin:keyboardLayout="@xml/row_qwerty4" /> +</merge> diff --git a/java/res/xml/rows_number.xml b/java/res/xml/rows_number.xml index 8da83be80..96564e8ff 100644 --- a/java/res/xml/rows_number.xml +++ b/java/res/xml/rows_number.xml @@ -20,7 +20,6 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="26.67%p" > <include latin:keyboardLayout="@xml/key_styles_common" /> diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index 38e6d5a1d..d5bd7fda3 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -880,18 +880,19 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { final KeyPreviewDrawParams params = mKeyPreviewDrawParams; final int keyDrawX = key.mX + key.mVisualInsetsLeft; final int keyDrawWidth = key.mWidth - key.mVisualInsetsLeft - key.mVisualInsetsRight; + final String label = key.isShiftedLetterActivated() ? key.mHintLabel : key.mLabel; // What we show as preview should match what we show on a key top in onBufferDraw(). - if (key.mLabel != null) { + if (label != null) { // TODO Should take care of temporaryShiftLabel here. previewText.setCompoundDrawables(null, null, null, null); - if (StringUtils.codePointCount(key.mLabel) > 1) { + if (StringUtils.codePointCount(label) > 1) { previewText.setTextSize(TypedValue.COMPLEX_UNIT_PX, params.mKeyLetterSize); previewText.setTypeface(Typeface.DEFAULT_BOLD); } else { previewText.setTextSize(TypedValue.COMPLEX_UNIT_PX, params.mPreviewTextSize); previewText.setTypeface(params.mKeyTextStyle); } - previewText.setText(key.mLabel); + previewText.setText(label); } else { previewText.setCompoundDrawables(null, null, null, key.getPreviewIcon(mKeyboard.mIconsSet)); diff --git a/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java b/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java index b67f327d7..613c20304 100644 --- a/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java +++ b/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java @@ -109,18 +109,15 @@ public class AdditionalSubtypeSettings extends PreferenceFragment { } static class KeyboardLayoutSetItem extends Pair<String, String> { - public KeyboardLayoutSetItem(String keyboardLayoutSetName) { - super(keyboardLayoutSetName, getDisplayName(keyboardLayoutSetName)); + public KeyboardLayoutSetItem(InputMethodSubtype subtype) { + super(SubtypeLocale.getKeyboardLayoutSetName(subtype), + SubtypeLocale.getKeyboardLayoutSetDisplayName(subtype)); } @Override public String toString() { return second; } - - private static String getDisplayName(String keyboardLayoutSetName) { - return keyboardLayoutSetName.toUpperCase(); - } } static class KeyboardLayoutSetAdapter extends ArrayAdapter<KeyboardLayoutSetItem> { @@ -130,7 +127,10 @@ public class AdditionalSubtypeSettings extends PreferenceFragment { // TODO: Should filter out already existing combinations of locale and layout. for (final String layout : SubtypeLocale.getPredefinedKeyboardLayoutSet()) { - add(new KeyboardLayoutSetItem(layout)); + // This is a dummy subtype with NO_LANGUAGE, only for display. + final InputMethodSubtype subtype = AdditionalSubtype.createAdditionalSubtype( + SubtypeLocale.NO_LANGUAGE, layout, null); + add(new KeyboardLayoutSetItem(subtype)); } } } @@ -196,8 +196,7 @@ public class AdditionalSubtypeSettings extends PreferenceFragment { .setNegativeButton(R.string.remove, this); final SubtypeLocaleItem localeItem = SubtypeLocaleAdapter.createItem( context, mSubtype.getLocale()); - final KeyboardLayoutSetItem layoutItem = new KeyboardLayoutSetItem( - SubtypeLocale.getKeyboardLayoutSetName(mSubtype)); + final KeyboardLayoutSetItem layoutItem = new KeyboardLayoutSetItem(mSubtype); setSpinnerPosition(mSubtypeLocaleSpinner, localeItem); setSpinnerPosition(mKeyboardLayoutSetSpinner, layoutItem); } diff --git a/java/src/com/android/inputmethod/latin/StringUtils.java b/java/src/com/android/inputmethod/latin/StringUtils.java index 160581cbe..a43b90525 100644 --- a/java/src/com/android/inputmethod/latin/StringUtils.java +++ b/java/src/com/android/inputmethod/latin/StringUtils.java @@ -123,6 +123,23 @@ public class StringUtils { } /** + * Returns true if cs contains any upper case characters. + * + * @param cs the CharSequence to check + * @return {@code true} if cs contains any upper case characters, {@code false} otherwise. + */ + public static boolean hasUpperCase(final CharSequence cs) { + final int length = cs.length(); + for (int i = 0, cp = 0; i < length; i += Character.charCount(cp)) { + cp = Character.codePointAt(cs, i); + if (Character.isUpperCase(cp)) { + return true; + } + } + return false; + } + + /** * Remove duplicates from an array of strings. * * This method will always keep the first occurrence of all strings at their position diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java index 86753e2cc..7cbee4f71 100644 --- a/java/src/com/android/inputmethod/latin/Suggest.java +++ b/java/src/com/android/inputmethod/latin/Suggest.java @@ -242,13 +242,8 @@ public class Suggest implements Dictionary.WordCallback { mBigramSuggestions = new ArrayList<SuggestedWordInfo>(PREF_MAX_BIGRAMS); - CharSequence lowerPrevWord = prevWordForBigram.toString().toLowerCase(); - if (mMainDict != null && mMainDict.isValidWord(lowerPrevWord)) { - prevWordForBigram = lowerPrevWord; - } - for (final Dictionary dictionary : mBigramDictionaries.values()) { - dictionary.getBigrams(sEmptyWordComposer, prevWordForBigram, this); - } + getAllBigrams(prevWordForBigram, sEmptyWordComposer); + // Nothing entered: return all bigrams for the previous word int insertCount = Math.min(mBigramSuggestions.size(), mPrefMaxSuggestions); for (int i = 0; i < insertCount; ++i) { @@ -290,13 +285,7 @@ public class Suggest implements Dictionary.WordCallback { mBigramSuggestions = new ArrayList<SuggestedWordInfo>(PREF_MAX_BIGRAMS); if (!TextUtils.isEmpty(prevWordForBigram)) { - CharSequence lowerPrevWord = prevWordForBigram.toString().toLowerCase(); - if (mMainDict != null && mMainDict.isValidWord(lowerPrevWord)) { - prevWordForBigram = lowerPrevWord; - } - for (final Dictionary dictionary : mBigramDictionaries.values()) { - dictionary.getBigrams(wordComposer, prevWordForBigram, this); - } + getAllBigrams(prevWordForBigram, wordComposer); if (TextUtils.isEmpty(consideredWord)) { // Nothing entered: return all bigrams for the previous word int insertCount = Math.min(mBigramSuggestions.size(), mPrefMaxSuggestions); @@ -409,6 +398,23 @@ public class Suggest implements Dictionary.WordCallback { false /* isObsoleteSuggestions */); } + /** + * Adds all bigram predictions for prevWord. Also checks the lower case version of prevWord if + * it contains any upper case characters. + */ + private void getAllBigrams(final CharSequence prevWord, final WordComposer wordComposer) { + if (StringUtils.hasUpperCase(prevWord)) { + // TODO: Must pay attention to locale when changing case. + final CharSequence lowerPrevWord = prevWord.toString().toLowerCase(); + for (final Dictionary dictionary : mBigramDictionaries.values()) { + dictionary.getBigrams(wordComposer, lowerPrevWord, this); + } + } + for (final Dictionary dictionary : mBigramDictionaries.values()) { + dictionary.getBigrams(wordComposer, prevWord, this); + } + } + private static ArrayList<SuggestedWordInfo> getSuggestionsInfoListWithDebugInfo( final String typedWord, final ArrayList<SuggestedWordInfo> suggestions) { final SuggestedWordInfo typedWordInfo = suggestions.get(0); |