diff options
Diffstat (limited to 'java')
37 files changed, 752 insertions, 539 deletions
diff --git a/java/res/values-cs/altchars.xml b/java/res/values-cs/altchars.xml index db2213df7..d91a0e449 100644 --- a/java/res/values-cs/altchars.xml +++ b/java/res/values-cs/altchars.xml @@ -19,16 +19,16 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">áàâãäåæ</string> - <string name="alternates_for_e">éěèêë</string> - <string name="alternates_for_i">íìîï</string> - <string name="alternates_for_o">óòôõöœø</string> - <string name="alternates_for_u">ůúùûü</string> + <string name="alternates_for_e">3éěèêë</string> + <string name="alternates_for_i">íìîï8</string> + <string name="alternates_for_o">óòôõöœø9</string> + <string name="alternates_for_u">ůúùûü7</string> <string name="alternates_for_s">š§ß</string> <string name="alternates_for_n">ňñ</string> <string name="alternates_for_c">čç</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> <string name="alternates_for_d">ď</string> - <string name="alternates_for_r">ř</string> - <string name="alternates_for_t">ť</string> + <string name="alternates_for_r">ř4</string> + <string name="alternates_for_t">ť5</string> <string name="alternates_for_z">ž</string> </resources> diff --git a/java/res/values-da/altchars.xml b/java/res/values-da/altchars.xml index 7b313bdba..b1cc8b627 100644 --- a/java/res/values-da/altchars.xml +++ b/java/res/values-da/altchars.xml @@ -19,17 +19,17 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">áàâąã</string> - <string name="alternates_for_e">éèêëę€</string> - <string name="alternates_for_i">íìîï</string> - <string name="alternates_for_o">óòôõ</string> - <string name="alternates_for_u">úùûū</string> + <string name="alternates_for_e">3éèêëę€</string> + <string name="alternates_for_i">íìîï8</string> + <string name="alternates_for_o">óòôõ9</string> + <string name="alternates_for_u">úùûū7</string> <string name="alternates_for_s">śšşß</string> <string name="alternates_for_n">ńñň</string> <string name="alternates_for_c">çćč</string> - <string name="alternates_for_y">ýÿü</string> + <string name="alternates_for_y">ýÿü6</string> <string name="alternates_for_d">ðď</string> - <string name="alternates_for_r">ř</string> - <string name="alternates_for_t">ťþ</string> + <string name="alternates_for_r">ř4</string> + <string name="alternates_for_t">ťþ5</string> <string name="alternates_for_z">źžż</string> <string name="alternates_for_l">ł</string> <string name="alternates_for_v">w</string> diff --git a/java/res/values-de/altchars.xml b/java/res/values-de/altchars.xml index edc2b082e..df27bce28 100644 --- a/java/res/values-de/altchars.xml +++ b/java/res/values-de/altchars.xml @@ -19,12 +19,13 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">ä</string> - <string name="alternates_for_e">èéêë</string> - <string name="alternates_for_i">ìíîï</string> - <string name="alternates_for_o">ö</string> - <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">ö9</string> + <string name="alternates_for_u">ùúûü7</string> <string name="alternates_for_s">§ß</string> <string name="alternates_for_n">ñ</string> <string name="alternates_for_c">ç</string> <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_z">6</string> </resources> diff --git a/java/res/values-el/altchars.xml b/java/res/values-el/altchars.xml index c165b11c5..d3beafade 100644 --- a/java/res/values-el/altchars.xml +++ b/java/res/values-el/altchars.xml @@ -19,12 +19,12 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">àáâãäåæ</string> - <string name="alternates_for_e">èéêë</string> - <string name="alternates_for_i">ìíîï</string> - <string name="alternates_for_o">òóôõöœø</string> - <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> <string name="alternates_for_s">§ß</string> <string name="alternates_for_n">ñ</string> <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> </resources> diff --git a/java/res/values-es-rUS/altchars.xml b/java/res/values-es-rUS/altchars.xml index c165b11c5..d3beafade 100644 --- a/java/res/values-es-rUS/altchars.xml +++ b/java/res/values-es-rUS/altchars.xml @@ -19,12 +19,12 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">àáâãäåæ</string> - <string name="alternates_for_e">èéêë</string> - <string name="alternates_for_i">ìíîï</string> - <string name="alternates_for_o">òóôõöœø</string> - <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> <string name="alternates_for_s">§ß</string> <string name="alternates_for_n">ñ</string> <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> </resources> diff --git a/java/res/values-es/altchars.xml b/java/res/values-es/altchars.xml index 23aff7381..721062d2d 100644 --- a/java/res/values-es/altchars.xml +++ b/java/res/values-es/altchars.xml @@ -19,12 +19,12 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">á</string> - <string name="alternates_for_e">é</string> - <string name="alternates_for_i">ìíîï</string> - <string name="alternates_for_o">ó</string> - <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_e">3é</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">ó9</string> + <string name="alternates_for_u">ùúûü7</string> <string name="alternates_for_s">§ß</string> <string name="alternates_for_n">ñ</string> <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> </resources> diff --git a/java/res/values-fr/altchars.xml b/java/res/values-fr/altchars.xml index c165b11c5..874d89dab 100644 --- a/java/res/values-fr/altchars.xml +++ b/java/res/values-fr/altchars.xml @@ -18,13 +18,16 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">àáâãäåæ</string> - <string name="alternates_for_e">èéêë</string> - <string name="alternates_for_i">ìíîï</string> - <string name="alternates_for_o">òóôõöœø</string> - <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_a">1àáâãäåæ</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> <string name="alternates_for_s">§ß</string> <string name="alternates_for_n">ñ</string> <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> + <string name="alternates_for_q"></string> + <string name="alternates_for_w"></string> + <string name="alternates_for_z">2</string> </resources> diff --git a/java/res/values-it/altchars.xml b/java/res/values-it/altchars.xml index d1f940593..23960171b 100644 --- a/java/res/values-it/altchars.xml +++ b/java/res/values-it/altchars.xml @@ -19,12 +19,12 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">àá</string> - <string name="alternates_for_e">èé</string> - <string name="alternates_for_i">ìíîï</string> - <string name="alternates_for_o">òó</string> - <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_e">3èé</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òó9</string> + <string name="alternates_for_u">ùúûü7</string> <string name="alternates_for_s">§</string> <string name="alternates_for_n">ñ</string> <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> </resources> diff --git a/java/res/values-ja/altchars.xml b/java/res/values-ja/altchars.xml index c165b11c5..d3beafade 100644 --- a/java/res/values-ja/altchars.xml +++ b/java/res/values-ja/altchars.xml @@ -19,12 +19,12 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">àáâãäåæ</string> - <string name="alternates_for_e">èéêë</string> - <string name="alternates_for_i">ìíîï</string> - <string name="alternates_for_o">òóôõöœø</string> - <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> <string name="alternates_for_s">§ß</string> <string name="alternates_for_n">ñ</string> <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> </resources> diff --git a/java/res/values-ko/altchars.xml b/java/res/values-ko/altchars.xml index c165b11c5..d3beafade 100644 --- a/java/res/values-ko/altchars.xml +++ b/java/res/values-ko/altchars.xml @@ -19,12 +19,12 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">àáâãäåæ</string> - <string name="alternates_for_e">èéêë</string> - <string name="alternates_for_i">ìíîï</string> - <string name="alternates_for_o">òóôõöœø</string> - <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> <string name="alternates_for_s">§ß</string> <string name="alternates_for_n">ñ</string> <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> </resources> diff --git a/java/res/values-nb/altchars.xml b/java/res/values-nb/altchars.xml index 2019f44f1..6257dfc31 100644 --- a/java/res/values-nb/altchars.xml +++ b/java/res/values-nb/altchars.xml @@ -19,17 +19,17 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">äáàâąã</string> - <string name="alternates_for_e">éèêëę€</string> - <string name="alternates_for_i">íìîï</string> - <string name="alternates_for_o">öóòôõ</string> - <string name="alternates_for_u">üúùûū</string> + <string name="alternates_for_e">3éèêëę€</string> + <string name="alternates_for_i">íìîï8</string> + <string name="alternates_for_o">öóòôõ9</string> + <string name="alternates_for_u">üúùûū7</string> <string name="alternates_for_s">śšşß</string> <string name="alternates_for_n">ńñň</string> <string name="alternates_for_c">çćč</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> <string name="alternates_for_d">ðď</string> - <string name="alternates_for_r">ř</string> - <string name="alternates_for_t">ťþ</string> + <string name="alternates_for_r">ř4</string> + <string name="alternates_for_t">ťþ5</string> <string name="alternates_for_z">źžż</string> <string name="alternates_for_l">ł</string> <string name="alternates_for_v">w</string> diff --git a/java/res/values-nl/altchars.xml b/java/res/values-nl/altchars.xml index c165b11c5..d3beafade 100644 --- a/java/res/values-nl/altchars.xml +++ b/java/res/values-nl/altchars.xml @@ -19,12 +19,12 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">àáâãäåæ</string> - <string name="alternates_for_e">èéêë</string> - <string name="alternates_for_i">ìíîï</string> - <string name="alternates_for_o">òóôõöœø</string> - <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> <string name="alternates_for_s">§ß</string> <string name="alternates_for_n">ñ</string> <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> </resources> diff --git a/java/res/values-pl/altchars.xml b/java/res/values-pl/altchars.xml index 2b6ac2f3f..da6b5fd5c 100644 --- a/java/res/values-pl/altchars.xml +++ b/java/res/values-pl/altchars.xml @@ -19,14 +19,14 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">ą</string> - <string name="alternates_for_e">ę</string> - <string name="alternates_for_i">ìíîï</string> - <string name="alternates_for_o">ó</string> - <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_e">ę3</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">ó9</string> + <string name="alternates_for_u">ùúûü7</string> <string name="alternates_for_s">ś</string> <string name="alternates_for_n">ń</string> <string name="alternates_for_c">ć</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> <string name="alternates_for_z">źż</string> <string name="alternates_for_l">ł</string> </resources> diff --git a/java/res/values-pt-rPT/altchars.xml b/java/res/values-pt-rPT/altchars.xml index c165b11c5..d3beafade 100644 --- a/java/res/values-pt-rPT/altchars.xml +++ b/java/res/values-pt-rPT/altchars.xml @@ -19,12 +19,12 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">àáâãäåæ</string> - <string name="alternates_for_e">èéêë</string> - <string name="alternates_for_i">ìíîï</string> - <string name="alternates_for_o">òóôõöœø</string> - <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> <string name="alternates_for_s">§ß</string> <string name="alternates_for_n">ñ</string> <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> </resources> diff --git a/java/res/values-pt/altchars.xml b/java/res/values-pt/altchars.xml index c165b11c5..d3beafade 100644 --- a/java/res/values-pt/altchars.xml +++ b/java/res/values-pt/altchars.xml @@ -19,12 +19,12 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">àáâãäåæ</string> - <string name="alternates_for_e">èéêë</string> - <string name="alternates_for_i">ìíîï</string> - <string name="alternates_for_o">òóôõöœø</string> - <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> <string name="alternates_for_s">§ß</string> <string name="alternates_for_n">ñ</string> <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> </resources> diff --git a/java/res/values-rm/altchars.xml b/java/res/values-rm/altchars.xml index 543b0e29c..f17026fa9 100644 --- a/java/res/values-rm/altchars.xml +++ b/java/res/values-rm/altchars.xml @@ -19,12 +19,12 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">àáâãäåæ</string> - <string name="alternates_for_e">èéêë</string> - <string name="alternates_for_i">ìíîï</string> - <string name="alternates_for_o">òóöôõœø</string> - <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóöôõœø9</string> + <string name="alternates_for_u">ùúûü7</string> <string name="alternates_for_s">§ß</string> <string name="alternates_for_n">ñ</string> <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> </resources> diff --git a/java/res/values-ru/altchars.xml b/java/res/values-ru/altchars.xml index f54586783..46241a62a 100644 --- a/java/res/values-ru/altchars.xml +++ b/java/res/values-ru/altchars.xml @@ -27,6 +27,6 @@ <string name="alternates_for_n">ñ</string> <string name="alternates_for_c">ç</string> <string name="alternates_for_y">ýÿ</string> - <string name="alternates_for_cyrillic_e">ё</string> + <string name="alternates_for_cyrillic_e">ё5</string> <string name="alternates_for_cyrillic_soft_sign">ъ</string> </resources> diff --git a/java/res/values-sv/altchars.xml b/java/res/values-sv/altchars.xml index 33a367bc2..4d26e6c47 100644 --- a/java/res/values-sv/altchars.xml +++ b/java/res/values-sv/altchars.xml @@ -19,17 +19,17 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">áàâąã</string> - <string name="alternates_for_e">éèêëę€</string> - <string name="alternates_for_i">íìîï</string> - <string name="alternates_for_o">óòôõ</string> - <string name="alternates_for_u">úùûū</string> + <string name="alternates_for_e">3éèêëę€</string> + <string name="alternates_for_i">íìîï8</string> + <string name="alternates_for_o">óòôõ9</string> + <string name="alternates_for_u">úùûū7</string> <string name="alternates_for_s">śšşß</string> <string name="alternates_for_n">ńñň</string> <string name="alternates_for_c">çćč</string> - <string name="alternates_for_y">ýÿü</string> + <string name="alternates_for_y">ýÿü6</string> <string name="alternates_for_d">ðď</string> - <string name="alternates_for_r">ř</string> - <string name="alternates_for_t">ťþ</string> + <string name="alternates_for_r">ř4</string> + <string name="alternates_for_t">ťþ5</string> <string name="alternates_for_z">źžż</string> <string name="alternates_for_l">ł</string> <string name="alternates_for_v">w</string> diff --git a/java/res/values-tr/altchars.xml b/java/res/values-tr/altchars.xml index 55ad8a75e..4200d949e 100644 --- a/java/res/values-tr/altchars.xml +++ b/java/res/values-tr/altchars.xml @@ -19,13 +19,13 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">àáâãäåæ</string> - <string name="alternates_for_e">èéêë</string> - <string name="alternates_for_i">ìíîï</string> - <string name="alternates_for_o">öòóôõœø</string> - <string name="alternates_for_u">üùúû</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">öòóôõœø9</string> + <string name="alternates_for_u">üùúû7</string> <string name="alternates_for_s">ş§ß</string> <string name="alternates_for_n">ñ</string> <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_y">ýÿ6</string> <string name="alternates_for_g">ğ</string> </resources>
\ No newline at end of file diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml index 53b4d5018..1794d4c86 100644 --- a/java/res/xml-da/kbd_qwerty.xml +++ b/java/res/xml-da/kbd_qwerty.xml @@ -34,10 +34,14 @@ <Row> <Key android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" android:keyWidth="8.75%p" android:keyEdgeFlags="left" /> <Key - android:keyLabel="w" /> + android:keyLabel="w" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> <Key android:keyLabel="e" android:popupKeyboard="@xml/kbd_popup_template" @@ -67,7 +71,9 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_o" /> <Key - android:keyLabel="p" /> + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" /> <Key android:keyLabel="å" android:keyWidth="8.75%p" @@ -91,7 +97,9 @@ <Key android:keyLabel="f" /> <Key - android:keyLabel="g" /> + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> <Key android:keyLabel="h" /> <Key @@ -119,9 +127,9 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_keyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -149,11 +157,11 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isModifier="true" android:isRepeatable="true" - android:isModifier="true" /> + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" @@ -163,8 +171,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -182,8 +190,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -194,8 +202,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_url" @@ -205,8 +213,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -222,8 +230,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -234,8 +242,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_email" @@ -245,8 +253,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -261,8 +269,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -272,8 +280,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_im" @@ -283,8 +291,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -302,8 +310,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -314,8 +322,8 @@ android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_webentry" @@ -325,8 +333,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -344,8 +352,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_keyboard_tab" @@ -362,7 +370,7 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="15%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-da/kbd_qwerty_black.xml b/java/res/xml-da/kbd_qwerty_black.xml index 414119a95..96bbd8c4f 100644 --- a/java/res/xml-da/kbd_qwerty_black.xml +++ b/java/res/xml-da/kbd_qwerty_black.xml @@ -34,10 +34,14 @@ <Row> <Key android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" android:keyWidth="8.75%p" android:keyEdgeFlags="left" /> <Key - android:keyLabel="w" /> + android:keyLabel="w" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> <Key android:keyLabel="e" android:popupKeyboard="@xml/kbd_popup_template" @@ -67,7 +71,9 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_o" /> <Key - android:keyLabel="p" /> + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" /> <Key android:keyLabel="å" android:keyWidth="8.75%p" @@ -91,7 +97,9 @@ <Key android:keyLabel="f" /> <Key - android:keyLabel="g" /> + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> <Key android:keyLabel="h" /> <Key @@ -119,9 +127,9 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_bkeyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -149,10 +157,10 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="15%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" /> + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" diff --git a/java/res/xml-de/kbd_qwerty.xml b/java/res/xml-de/kbd_qwerty.xml index f03683c77..d5690577f 100644 --- a/java/res/xml-de/kbd_qwerty.xml +++ b/java/res/xml-de/kbd_qwerty.xml @@ -28,19 +28,29 @@ <Row> <Key android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" android:keyEdgeFlags="left" /> <Key - android:keyLabel="w" /> + android:keyLabel="w" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> <Key android:keyLabel="e" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_e" /> <Key - android:keyLabel="r" /> + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> <Key - android:keyLabel="t" /> + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> <Key - android:keyLabel="z" /> + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> <Key android:keyLabel="u" android:popupKeyboard="@xml/kbd_popup_template" @@ -55,25 +65,31 @@ android:popupCharacters="@string/alternates_for_o" /> <Key android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" android:keyEdgeFlags="right" /> </Row> <Row> <Key android:keyLabel="a" - android:horizontalGap="5%p" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_a" + android:horizontalGap="5%p" android:keyEdgeFlags="left" /> <Key android:keyLabel="s" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_s" /> <Key - android:keyLabel="d" /> + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> <Key android:keyLabel="f" /> <Key - android:keyLabel="g" /> + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> <Key android:keyLabel="h" /> <Key @@ -82,15 +98,17 @@ android:keyLabel="k" /> <Key android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" android:keyEdgeFlags="right" /> </Row> <Row> <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_keyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -104,7 +122,9 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_c" /> <Key - android:keyLabel="v" /> + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> <Key android:keyLabel="b" /> <Key @@ -116,11 +136,11 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isModifier="true" android:isRepeatable="true" - android:isModifier="true" /> + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" @@ -130,8 +150,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -149,8 +169,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -161,8 +181,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_url" @@ -172,8 +192,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -189,8 +209,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -201,8 +221,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_email" @@ -212,8 +232,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -228,8 +248,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -239,8 +259,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_im" @@ -250,8 +270,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -269,8 +289,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -281,8 +301,8 @@ android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_webentry" @@ -292,8 +312,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -311,9 +331,10 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key + android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_keyboard_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:keyWidth="10%p" @@ -328,7 +349,7 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="15%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-de/kbd_qwerty_black.xml b/java/res/xml-de/kbd_qwerty_black.xml index 29cb2d10d..791aa0263 100644 --- a/java/res/xml-de/kbd_qwerty_black.xml +++ b/java/res/xml-de/kbd_qwerty_black.xml @@ -28,19 +28,29 @@ <Row> <Key android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" android:keyEdgeFlags="left" /> <Key - android:keyLabel="w" /> + android:keyLabel="w" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> <Key android:keyLabel="e" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_e" /> <Key - android:keyLabel="r" /> + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> <Key - android:keyLabel="t" /> + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> <Key - android:keyLabel="z" /> + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> <Key android:keyLabel="u" android:popupKeyboard="@xml/kbd_popup_template" @@ -55,25 +65,31 @@ android:popupCharacters="@string/alternates_for_o" /> <Key android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" android:keyEdgeFlags="right" /> </Row> <Row> <Key android:keyLabel="a" - android:horizontalGap="5%p" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_a" + android:horizontalGap="5%p" android:keyEdgeFlags="left" /> <Key android:keyLabel="s" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_s" /> <Key - android:keyLabel="d" /> + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> <Key android:keyLabel="f" /> <Key - android:keyLabel="g" /> + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> <Key android:keyLabel="h" /> <Key @@ -82,15 +98,17 @@ android:keyLabel="k" /> <Key android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" android:keyEdgeFlags="right" /> </Row> <Row> <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_bkeyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -104,7 +122,9 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_c" /> <Key - android:keyLabel="v" /> + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> <Key android:keyLabel="b" /> <Key @@ -116,10 +136,10 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="15%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" /> + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" @@ -285,6 +305,7 @@ android:keyWidth="30%p" android:isRepeatable="true" /> <Key + android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_bkeyboard_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:keyWidth="10%p" /> diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml index 7a6c1ea07..1eabd6759 100644 --- a/java/res/xml-fr/kbd_qwerty.xml +++ b/java/res/xml-fr/kbd_qwerty.xml @@ -32,15 +32,21 @@ android:popupCharacters="@string/alternates_for_a" android:keyEdgeFlags="left" /> <Key - android:keyLabel="z" /> + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> <Key android:keyLabel="e" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_e" /> <Key - android:keyLabel="r" /> + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> <Key - android:keyLabel="t" /> + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> <Key android:keyLabel="y" android:popupKeyboard="@xml/kbd_popup_template" @@ -59,22 +65,30 @@ android:popupCharacters="@string/alternates_for_o" /> <Key android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" android:keyEdgeFlags="right" /> </Row> <Row> <Key android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" android:keyEdgeFlags="left" /> <Key android:keyLabel="s" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_s" /> <Key - android:keyLabel="d" /> + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> <Key android:keyLabel="f" /> <Key - android:keyLabel="g" /> + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> <Key android:keyLabel="h" /> <Key @@ -82,7 +96,9 @@ <Key android:keyLabel="k" /> <Key - android:keyLabel="l" /> + android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" /> <Key android:keyLabel="m" android:keyEdgeFlags="right" /> @@ -91,13 +107,15 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_keyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key - android:keyLabel="w" /> + android:keyLabel="w" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> <Key android:keyLabel="x" /> <Key @@ -105,24 +123,25 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_c" /> <Key - android:keyLabel="v" /> + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> <Key android:keyLabel="b" /> <Key android:keyLabel="n" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_n" /> - <!--Key android:codes="233,224,232,234" android:keyLabel="é"/ --> <Key android:keyLabel="\'" /> <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isModifier="true" android:isRepeatable="true" - android:isModifier="true" /> + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" @@ -132,8 +151,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -151,8 +170,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -163,8 +182,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_url" @@ -174,8 +193,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -191,8 +210,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -203,8 +222,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_email" @@ -214,8 +233,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -230,8 +249,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -241,8 +260,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_im" @@ -252,8 +271,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -271,8 +290,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -283,8 +302,8 @@ android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_webentry" @@ -294,8 +313,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -313,8 +332,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_keyboard_tab" @@ -331,7 +350,7 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="15%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-fr/kbd_qwerty_black.xml b/java/res/xml-fr/kbd_qwerty_black.xml index c8e314acc..a4ed8ebc5 100644 --- a/java/res/xml-fr/kbd_qwerty_black.xml +++ b/java/res/xml-fr/kbd_qwerty_black.xml @@ -32,15 +32,21 @@ android:popupCharacters="@string/alternates_for_a" android:keyEdgeFlags="left" /> <Key - android:keyLabel="z" /> + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> <Key android:keyLabel="e" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_e" /> <Key - android:keyLabel="r" /> + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> <Key - android:keyLabel="t" /> + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> <Key android:keyLabel="y" android:popupKeyboard="@xml/kbd_popup_template" @@ -59,22 +65,30 @@ android:popupCharacters="@string/alternates_for_o" /> <Key android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" android:keyEdgeFlags="right" /> </Row> <Row> <Key android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" android:keyEdgeFlags="left" /> <Key android:keyLabel="s" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_s" /> <Key - android:keyLabel="d" /> + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> <Key android:keyLabel="f" /> <Key - android:keyLabel="g" /> + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> <Key android:keyLabel="h" /> <Key @@ -82,7 +96,9 @@ <Key android:keyLabel="k" /> <Key - android:keyLabel="l" /> + android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" /> <Key android:keyLabel="m" android:keyEdgeFlags="right" /> @@ -91,13 +107,15 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_bkeyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key - android:keyLabel="w" /> + android:keyLabel="w" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> <Key android:keyLabel="x" /> <Key @@ -105,23 +123,24 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_c" /> <Key - android:keyLabel="v" /> + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> <Key android:keyLabel="b" /> <Key android:keyLabel="n" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_n" /> - <!--Key android:codes="233,224,232,234" android:keyLabel="é"/ --> <Key android:keyLabel="\'" /> <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="15%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" /> + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml index c8b5f4b13..21a222258 100644 --- a/java/res/xml-iw/kbd_qwerty.xml +++ b/java/res/xml-iw/kbd_qwerty.xml @@ -46,13 +46,13 @@ android:keyLabel="פ" /> <Key android:codes="@integer/key_delete" - android:horizontalGap="1.25%p" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="13.75%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="13.75%p" + android:isModifier="true" + android:horizontalGap="1.25%p" android:isRepeatable="true" - android:isModifier="true" /> + android:keyEdgeFlags="right" /> </Row> <Row> <Key @@ -109,8 +109,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -128,8 +128,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -140,8 +140,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_url" @@ -151,8 +151,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -168,8 +168,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -180,8 +180,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_email" @@ -207,8 +207,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -218,8 +218,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_im" @@ -229,8 +229,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -248,8 +248,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -260,8 +260,8 @@ android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_webentry" @@ -271,8 +271,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -290,8 +290,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_keyboard_tab" @@ -308,7 +308,7 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="15%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-iw/kbd_qwerty_black.xml b/java/res/xml-iw/kbd_qwerty_black.xml index 70c6a90b3..36cb8aa44 100644 --- a/java/res/xml-iw/kbd_qwerty_black.xml +++ b/java/res/xml-iw/kbd_qwerty_black.xml @@ -46,12 +46,12 @@ android:keyLabel="פ" /> <Key android:codes="@integer/key_delete" - android:horizontalGap="1.25%p" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="13.75%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" /> + android:keyWidth="13.75%p" + android:horizontalGap="1.25%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> <Row> <Key diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml index 548ba2d8e..da430b8b3 100644 --- a/java/res/xml-nb/kbd_qwerty.xml +++ b/java/res/xml-nb/kbd_qwerty.xml @@ -34,10 +34,14 @@ <Row> <Key android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" android:keyWidth="8.75%p" android:keyEdgeFlags="left" /> <Key - android:keyLabel="w" /> + android:keyLabel="w" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> <Key android:keyLabel="e" android:popupKeyboard="@xml/kbd_popup_template" @@ -67,7 +71,9 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_o" /> <Key - android:keyLabel="p" /> + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" /> <Key android:keyLabel="å" android:keyWidth="8.75%p" @@ -91,7 +97,9 @@ <Key android:keyLabel="f" /> <Key - android:keyLabel="g" /> + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> <Key android:keyLabel="h" /> <Key @@ -108,6 +116,8 @@ android:popupCharacters="@string/alternates_for_oe" /> <Key android:keyLabel="æ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_ae" android:keyWidth="8.75%p" android:keyEdgeFlags="right" /> </Row> @@ -117,9 +127,9 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_keyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -147,11 +157,11 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isModifier="true" android:isRepeatable="true" - android:isModifier="true" /> + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" @@ -161,8 +171,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -180,8 +190,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -192,8 +202,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_url" @@ -203,8 +213,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -220,8 +230,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -232,8 +242,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_email" @@ -243,8 +253,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -259,8 +269,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -270,8 +280,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_im" @@ -281,8 +291,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -300,8 +310,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -312,8 +322,8 @@ android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_webentry" @@ -323,8 +333,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -342,8 +352,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_keyboard_tab" @@ -360,7 +370,7 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="15%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-nb/kbd_qwerty_black.xml b/java/res/xml-nb/kbd_qwerty_black.xml index ffc94dcd8..990d7af38 100644 --- a/java/res/xml-nb/kbd_qwerty_black.xml +++ b/java/res/xml-nb/kbd_qwerty_black.xml @@ -34,10 +34,14 @@ <Row> <Key android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" android:keyWidth="8.75%p" android:keyEdgeFlags="left" /> <Key - android:keyLabel="w" /> + android:keyLabel="w" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> <Key android:keyLabel="e" android:popupKeyboard="@xml/kbd_popup_template" @@ -67,7 +71,9 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_o" /> <Key - android:keyLabel="p" /> + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" /> <Key android:keyLabel="å" android:keyWidth="8.75%p" @@ -91,7 +97,9 @@ <Key android:keyLabel="f" /> <Key - android:keyLabel="g" /> + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> <Key android:keyLabel="h" /> <Key @@ -108,6 +116,8 @@ android:popupCharacters="@string/alternates_for_oe" /> <Key android:keyLabel="æ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_ae" android:keyWidth="8.75%p" android:keyEdgeFlags="right" /> </Row> @@ -117,9 +127,9 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_bkeyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -147,10 +157,10 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="15%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" /> + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml index a7a46ee4e..b86a3d68b 100644 --- a/java/res/xml-ru/kbd_qwerty.xml +++ b/java/res/xml-ru/kbd_qwerty.xml @@ -28,28 +28,46 @@ <Row> <Key android:keyLabel="й" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="1" android:keyWidth="8.75%p" android:keyEdgeFlags="left" /> <Key - android:keyLabel="ц" /> + android:keyLabel="ц" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="2" /> <Key - android:keyLabel="у" /> + android:keyLabel="у" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="3" /> <Key - android:keyLabel="к" /> + android:keyLabel="к" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="4" /> <Key android:keyLabel="е" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_cyrillic_e" /> <Key - android:keyLabel="н" /> + android:keyLabel="н" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="6" /> <Key - android:keyLabel="г" /> + android:keyLabel="г" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="7" /> <Key - android:keyLabel="ш" /> + android:keyLabel="ш" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="8" /> <Key - android:keyLabel="щ" /> + android:keyLabel="щ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="9" /> <Key - android:keyLabel="з" /> + android:keyLabel="з" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="0" /> <Key android:keyLabel="х" android:keyWidth="8.75%p" @@ -89,9 +107,9 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_keyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="11.75%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -117,11 +135,11 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="11.75%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="11.75%p" + android:isModifier="true" android:isRepeatable="true" - android:isModifier="true" /> + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" @@ -131,8 +149,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -150,8 +168,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -162,8 +180,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_url" @@ -173,8 +191,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -190,8 +208,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -202,8 +220,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_email" @@ -213,8 +231,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -229,8 +247,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -240,8 +258,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_im" @@ -251,8 +269,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -270,8 +288,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -282,8 +300,8 @@ android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_webentry" @@ -293,8 +311,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -312,8 +330,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_keyboard_tab" @@ -330,7 +348,7 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="15%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-ru/kbd_qwerty_black.xml b/java/res/xml-ru/kbd_qwerty_black.xml index e6f368995..711d0bed1 100644 --- a/java/res/xml-ru/kbd_qwerty_black.xml +++ b/java/res/xml-ru/kbd_qwerty_black.xml @@ -28,28 +28,46 @@ <Row> <Key android:keyLabel="й" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="1" android:keyWidth="8.75%p" android:keyEdgeFlags="left" /> <Key - android:keyLabel="ц" /> + android:keyLabel="ц" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="2" /> <Key - android:keyLabel="у" /> + android:keyLabel="у" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="3" /> <Key - android:keyLabel="к" /> + android:keyLabel="к" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="4" /> <Key android:keyLabel="е" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_cyrillic_e" /> <Key - android:keyLabel="н" /> + android:keyLabel="н" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="6" /> <Key - android:keyLabel="г" /> + android:keyLabel="г" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="7" /> <Key - android:keyLabel="ш" /> + android:keyLabel="ш" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="8" /> <Key - android:keyLabel="щ" /> + android:keyLabel="щ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="9" /> <Key - android:keyLabel="з" /> + android:keyLabel="з" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="0" /> <Key android:keyLabel="х" android:keyWidth="8.75%p" @@ -89,9 +107,9 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_bkeyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="11.75%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -117,10 +135,10 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="11.75%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" /> + android:keyWidth="11.75%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" diff --git a/java/res/xml-sr/kbd_qwerty.xml b/java/res/xml-sr/kbd_qwerty.xml index 351950d38..7e24e0790 100644 --- a/java/res/xml-sr/kbd_qwerty.xml +++ b/java/res/xml-sr/kbd_qwerty.xml @@ -29,25 +29,45 @@ <Row> <Key android:keyLabel="љ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="1" android:keyEdgeFlags="left" /> <Key - android:keyLabel="њ" /> + android:keyLabel="њ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="2" /> <Key - android:keyLabel="е" /> + android:keyLabel="е" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="3" /> <Key - android:keyLabel="р" /> + android:keyLabel="р" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="4" /> <Key - android:keyLabel="т" /> + android:keyLabel="т" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="5" /> <Key - android:keyLabel="з" /> + android:keyLabel="з" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="6" /> <Key - android:keyLabel="у" /> + android:keyLabel="у" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="7" /> <Key - android:keyLabel="и" /> + android:keyLabel="и" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="8" /> <Key - android:keyLabel="о" /> + android:keyLabel="о" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="9" /> <Key - android:keyLabel="п" /> + android:keyLabel="п" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="0" /> <Key android:keyLabel="ш" android:keyEdgeFlags="right" /> @@ -86,9 +106,9 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_keyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="11.75%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -108,11 +128,11 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="11.75%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="11.75%p" + android:isModifier="true" android:isRepeatable="true" - android:isModifier="true" /> + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" @@ -122,8 +142,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -141,8 +161,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -153,8 +173,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_url" @@ -164,8 +184,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -181,8 +201,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -193,8 +213,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_email" @@ -204,8 +224,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -220,8 +240,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -231,8 +251,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_im" @@ -261,8 +281,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -273,8 +293,8 @@ android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_webentry" @@ -284,8 +304,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -303,8 +323,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_keyboard_tab" @@ -321,7 +341,7 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="15%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-sr/kbd_qwerty_black.xml b/java/res/xml-sr/kbd_qwerty_black.xml index 74375e62d..a376e5fd5 100644 --- a/java/res/xml-sr/kbd_qwerty_black.xml +++ b/java/res/xml-sr/kbd_qwerty_black.xml @@ -29,25 +29,45 @@ <Row> <Key android:keyLabel="љ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="1" android:keyEdgeFlags="left" /> <Key - android:keyLabel="њ" /> + android:keyLabel="њ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="2" /> <Key - android:keyLabel="е" /> + android:keyLabel="е" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="3" /> <Key - android:keyLabel="р" /> + android:keyLabel="р" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="4" /> <Key - android:keyLabel="т" /> + android:keyLabel="т" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="5" /> <Key - android:keyLabel="з" /> + android:keyLabel="з" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="6" /> <Key - android:keyLabel="у" /> + android:keyLabel="у" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="7" /> <Key - android:keyLabel="и" /> + android:keyLabel="и" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="8" /> <Key - android:keyLabel="о" /> + android:keyLabel="о" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="9" /> <Key - android:keyLabel="п" /> + android:keyLabel="п" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="0" /> <Key android:keyLabel="ш" android:keyEdgeFlags="right" /> @@ -86,9 +106,9 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_bkeyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="11.75%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -108,10 +128,10 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="11.75%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" /> + android:keyWidth="11.75%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml index 7fd72a4a4..efca9c0f7 100644 --- a/java/res/xml-sv/kbd_qwerty.xml +++ b/java/res/xml-sv/kbd_qwerty.xml @@ -36,10 +36,14 @@ <Row> <Key android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" android:keyWidth="8.75%p" android:keyEdgeFlags="left" /> <Key - android:keyLabel="w" /> + android:keyLabel="w" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> <Key android:keyLabel="e" android:popupKeyboard="@xml/kbd_popup_template" @@ -69,7 +73,9 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_o" /> <Key - android:keyLabel="p" /> + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" /> <Key android:keyLabel="å" android:keyWidth="8.75%p" @@ -93,7 +99,9 @@ <Key android:keyLabel="f" /> <Key - android:keyLabel="g" /> + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> <Key android:keyLabel="h" /> <Key @@ -121,9 +129,9 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_keyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -151,10 +159,10 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" /> + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" @@ -164,8 +172,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -183,8 +191,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -195,8 +203,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_url" @@ -206,8 +214,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -223,8 +231,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -235,8 +243,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_email" @@ -246,8 +254,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -262,8 +270,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -273,8 +281,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_im" @@ -284,8 +292,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -303,8 +311,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -315,8 +323,8 @@ android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_webentry" @@ -326,8 +334,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -345,8 +353,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_keyboard_tab" @@ -363,7 +371,7 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="15%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-sv/kbd_qwerty_black.xml b/java/res/xml-sv/kbd_qwerty_black.xml index 68caa3e37..f1f3653ea 100644 --- a/java/res/xml-sv/kbd_qwerty_black.xml +++ b/java/res/xml-sv/kbd_qwerty_black.xml @@ -36,10 +36,14 @@ <Row> <Key android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" android:keyWidth="8.75%p" android:keyEdgeFlags="left" /> <Key - android:keyLabel="w" /> + android:keyLabel="w" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> <Key android:keyLabel="e" android:popupKeyboard="@xml/kbd_popup_template" @@ -69,7 +73,9 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_o" /> <Key - android:keyLabel="p" /> + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" /> <Key android:keyLabel="å" android:keyWidth="8.75%p" @@ -93,7 +99,9 @@ <Key android:keyLabel="f" /> <Key - android:keyLabel="g" /> + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> <Key android:keyLabel="h" /> <Key @@ -121,9 +129,9 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_bkeyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -151,10 +159,10 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="15%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" /> + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml index 48a93adf2..44562875a 100644 --- a/java/res/xml/kbd_qwerty.xml +++ b/java/res/xml/kbd_qwerty.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* +/* ** ** Copyright 2008, The Android Open Source Project ** @@ -18,9 +18,6 @@ */ --> -<!-- TODO: Add settings key to other languages --> -<!-- TODO: Add modifier attr to functional keys in other languages --> - <Keyboard xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" @@ -31,9 +28,9 @@ <Row> <Key android:keyLabel="q" - android:keyEdgeFlags="left" android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_q" /> + android:popupCharacters="@string/alternates_for_q" + android:keyEdgeFlags="left" /> <Key android:keyLabel="w" android:popupKeyboard="@xml/kbd_popup_template" @@ -68,16 +65,16 @@ android:popupCharacters="@string/alternates_for_o" /> <Key android:keyLabel="p" - android:keyEdgeFlags="right" android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_p" /> + android:popupCharacters="@string/alternates_for_p" + android:keyEdgeFlags="right" /> </Row> <Row> <Key android:keyLabel="a" - android:horizontalGap="5%p" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_a" + android:horizontalGap="5%p" android:keyEdgeFlags="left" /> <Key android:keyLabel="s" @@ -109,9 +106,9 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_keyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -125,7 +122,9 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_c" /> <Key - android:keyLabel="v" /> + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> <Key android:keyLabel="b" /> <Key @@ -137,11 +136,11 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isModifier="true" android:isRepeatable="true" - android:isModifier="true" /> + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" @@ -151,8 +150,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -170,8 +169,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -182,8 +181,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_url" @@ -193,8 +192,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -210,8 +209,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -222,8 +221,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_email" @@ -233,8 +232,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -249,8 +248,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -260,8 +259,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_im" @@ -271,8 +270,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -290,8 +289,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -302,8 +301,8 @@ android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_webentry" @@ -313,8 +312,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -332,8 +331,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_keyboard_tab" @@ -350,7 +349,7 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="15%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml index 6faa5189e..d40203d9d 100644 --- a/java/res/xml/kbd_qwerty_black.xml +++ b/java/res/xml/kbd_qwerty_black.xml @@ -28,9 +28,9 @@ <Row> <Key android:keyLabel="q" - android:keyEdgeFlags="left" android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_q" /> + android:popupCharacters="@string/alternates_for_q" + android:keyEdgeFlags="left" /> <Key android:keyLabel="w" android:popupKeyboard="@xml/kbd_popup_template" @@ -65,16 +65,16 @@ android:popupCharacters="@string/alternates_for_o" /> <Key android:keyLabel="p" - android:keyEdgeFlags="right" android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_p" /> + android:popupCharacters="@string/alternates_for_p" + android:keyEdgeFlags="right" /> </Row> <Row> <Key android:keyLabel="a" - android:horizontalGap="5%p" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_a" + android:horizontalGap="5%p" android:keyEdgeFlags="left" /> <Key android:keyLabel="s" @@ -106,9 +106,9 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_bkeyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -122,7 +122,9 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_c" /> <Key - android:keyLabel="v" /> + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> <Key android:keyLabel="b" /> <Key @@ -134,10 +136,10 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="15%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" /> + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" |