diff options
Diffstat (limited to 'java/res')
90 files changed, 228 insertions, 1375 deletions
diff --git a/java/res/values-cs/donottranslate-altchars.xml b/java/res/values-cs/donottranslate-altchars.xml index d91a0e449..f19ac0026 100644 --- a/java/res/values-cs/donottranslate-altchars.xml +++ b/java/res/values-cs/donottranslate-altchars.xml @@ -18,17 +18,16 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">áàâãäåæ</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">ýÿ6</string> + <string name="alternates_for_a">á,à,â,ã,ä,å,æ</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_d">ď</string> - <string name="alternates_for_r">ř4</string> - <string name="alternates_for_t">ť5</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/donottranslate-altchars.xml b/java/res/values-da/donottranslate-altchars.xml index 596994ca4..ca1df7c25 100644 --- a/java/res/values-da/donottranslate-altchars.xml +++ b/java/res/values-da/donottranslate-altchars.xml @@ -18,23 +18,23 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">áàâąã</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">ýÿü6</string> - <string name="alternates_for_d">ðď</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_a">á,à,â,ą,ã</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">ý,ÿ,ü,6</string> + <string name="alternates_for_d">ð,ď</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> <string name="keylabel_for_scandinavia_row2_10">æ</string> <string name="keylabel_for_scandinavia_row2_11">ø</string> <string name="alternates_for_scandinavia_row2_10">ä</string> - <string name="alternates_for_scandinavia_row2_11">öœ</string> + <string name="alternates_for_scandinavia_row2_11">ö,œ</string> </resources> diff --git a/java/res/values-de/donottranslate-altchars.xml b/java/res/values-de/donottranslate-altchars.xml index df27bce28..6c1abc6d0 100644 --- a/java/res/values-de/donottranslate-altchars.xml +++ b/java/res/values-de/donottranslate-altchars.xml @@ -19,13 +19,7 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">ä</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_o">ö,9</string> + <string name="alternates_for_y">ý,ÿ</string> <string name="alternates_for_z">6</string> </resources> diff --git a/java/res/values-el/donottranslate-altchars.xml b/java/res/values-el/donottranslate-altchars.xml deleted file mode 100644 index d3beafade..000000000 --- a/java/res/values-el/donottranslate-altchars.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">àáâãäåæ</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">ýÿ6</string> -</resources> diff --git a/java/res/values-en/donottranslate-altchars.xml b/java/res/values-en/donottranslate-altchars.xml index 083befa19..baded885a 100644 --- a/java/res/values-en/donottranslate-altchars.xml +++ b/java/res/values-en/donottranslate-altchars.xml @@ -18,10 +18,9 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">àáâãäåāæ</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_y">ýÿ6</string> + <string name="alternates_for_a">à,á,â,ã,ä,å,ā,æ</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> </resources> diff --git a/java/res/values-es-rUS/donottranslate-altchars.xml b/java/res/values-es-rUS/donottranslate-altchars.xml deleted file mode 100644 index d3beafade..000000000 --- a/java/res/values-es-rUS/donottranslate-altchars.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">àáâãäåæ</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">ýÿ6</string> -</resources> diff --git a/java/res/values-es/donottranslate-altchars.xml b/java/res/values-es/donottranslate-altchars.xml index 721062d2d..35187d0de 100644 --- a/java/res/values-es/donottranslate-altchars.xml +++ b/java/res/values-es/donottranslate-altchars.xml @@ -19,12 +19,6 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">á</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">ýÿ6</string> + <string name="alternates_for_e">3,é</string> + <string name="alternates_for_o">ó,9</string> </resources> diff --git a/java/res/values-fr/donottranslate-altchars.xml b/java/res/values-fr/donottranslate-altchars.xml index 874d89dab..830119d52 100644 --- a/java/res/values-fr/donottranslate-altchars.xml +++ b/java/res/values-fr/donottranslate-altchars.xml @@ -18,15 +18,7 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <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">ýÿ6</string> + <string name="alternates_for_a">1,à,á,â,ã,ä,å,æ</string> <string name="alternates_for_q"></string> <string name="alternates_for_w"></string> <string name="alternates_for_z">2</string> diff --git a/java/res/values-it/donottranslate-altchars.xml b/java/res/values-it/donottranslate-altchars.xml index 23960171b..0e4a285f1 100644 --- a/java/res/values-it/donottranslate-altchars.xml +++ b/java/res/values-it/donottranslate-altchars.xml @@ -18,13 +18,8 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">àá</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_a">à,á</string> + <string name="alternates_for_e">3,è,é</string> + <string name="alternates_for_o">ò,ó,9</string> <string name="alternates_for_s">§</string> - <string name="alternates_for_n">ñ</string> - <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ6</string> </resources> diff --git a/java/res/values-ja/donottranslate-altchars.xml b/java/res/values-ja/donottranslate-altchars.xml deleted file mode 100644 index d3beafade..000000000 --- a/java/res/values-ja/donottranslate-altchars.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">àáâãäåæ</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">ýÿ6</string> -</resources> diff --git a/java/res/values-ko/donottranslate-altchars.xml b/java/res/values-ko/donottranslate-altchars.xml deleted file mode 100644 index d3beafade..000000000 --- a/java/res/values-ko/donottranslate-altchars.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">àáâãäåæ</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">ýÿ6</string> -</resources> diff --git a/java/res/values-nb/donottranslate-altchars.xml b/java/res/values-nb/donottranslate-altchars.xml index 264402987..c65dea9fb 100644 --- a/java/res/values-nb/donottranslate-altchars.xml +++ b/java/res/values-nb/donottranslate-altchars.xml @@ -18,19 +18,18 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">äáàâąã</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">ýÿ6</string> - <string name="alternates_for_d">ðď</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_a">ä,á,à,â,ą,ã</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_d">ð,ď</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> <string name="keylabel_for_scandinavia_row2_10">ø</string> diff --git a/java/res/values-nl/donottranslate-altchars.xml b/java/res/values-nl/donottranslate-altchars.xml deleted file mode 100644 index d3beafade..000000000 --- a/java/res/values-nl/donottranslate-altchars.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">àáâãäåæ</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">ýÿ6</string> -</resources> diff --git a/java/res/values-pl/donottranslate-altchars.xml b/java/res/values-pl/donottranslate-altchars.xml index da6b5fd5c..df8c52b47 100644 --- a/java/res/values-pl/donottranslate-altchars.xml +++ b/java/res/values-pl/donottranslate-altchars.xml @@ -19,14 +19,11 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_a">ą</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_e">ę,3</string> + <string name="alternates_for_o">ó,9</string> <string name="alternates_for_s">ś</string> <string name="alternates_for_n">ń</string> <string name="alternates_for_c">ć</string> - <string name="alternates_for_y">ýÿ6</string> - <string name="alternates_for_z">źż</string> + <string name="alternates_for_z">ź,ż</string> <string name="alternates_for_l">ł</string> </resources> diff --git a/java/res/values-pt-rPT/donottranslate-altchars.xml b/java/res/values-pt-rPT/donottranslate-altchars.xml deleted file mode 100644 index d3beafade..000000000 --- a/java/res/values-pt-rPT/donottranslate-altchars.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">àáâãäåæ</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">ýÿ6</string> -</resources> diff --git a/java/res/values-pt/donottranslate-altchars.xml b/java/res/values-pt/donottranslate-altchars.xml deleted file mode 100644 index d3beafade..000000000 --- a/java/res/values-pt/donottranslate-altchars.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">àáâãäåæ</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">ýÿ6</string> -</resources> diff --git a/java/res/values-rm/donottranslate-altchars.xml b/java/res/values-rm/donottranslate-altchars.xml index f17026fa9..b44c3c005 100644 --- a/java/res/values-rm/donottranslate-altchars.xml +++ b/java/res/values-rm/donottranslate-altchars.xml @@ -18,13 +18,5 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">àáâãäåæ</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">ýÿ6</string> + <string name="alternates_for_o">ò,ó,ö,ô,õ,œ,ø,9</string> </resources> diff --git a/java/res/values-ru/donottranslate-altchars.xml b/java/res/values-ru/donottranslate-altchars.xml index 46241a62a..c4f9d66d3 100644 --- a/java/res/values-ru/donottranslate-altchars.xml +++ b/java/res/values-ru/donottranslate-altchars.xml @@ -18,15 +18,6 @@ */ --> <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_s">§ß</string> - <string name="alternates_for_n">ñ</string> - <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</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/donottranslate-altchars.xml b/java/res/values-sv/donottranslate-altchars.xml index 902a4c9bb..e156de896 100644 --- a/java/res/values-sv/donottranslate-altchars.xml +++ b/java/res/values-sv/donottranslate-altchars.xml @@ -18,23 +18,23 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">áàâąã</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">ýÿü6</string> - <string name="alternates_for_d">ðď</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_a">á,à,â,ą,ã</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">ý,ÿ,ü,6</string> + <string name="alternates_for_d">ð,ď</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> <string name="keylabel_for_scandinavia_row2_10">ö</string> <string name="keylabel_for_scandinavia_row2_11">ä</string> - <string name="alternates_for_scandinavia_row2_10">øœ</string> + <string name="alternates_for_scandinavia_row2_10">ø,œ</string> <string name="alternates_for_scandinavia_row2_11">æ</string> </resources> diff --git a/java/res/values-tr/donottranslate-altchars.xml b/java/res/values-tr/donottranslate-altchars.xml index 4200d949e..5e98cc30e 100644 --- a/java/res/values-tr/donottranslate-altchars.xml +++ b/java/res/values-tr/donottranslate-altchars.xml @@ -18,14 +18,8 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">àáâãäåæ</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">ýÿ6</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_g">ğ</string> -</resources>
\ No newline at end of file +</resources> diff --git a/java/res/values-xlarge/bools.xml b/java/res/values-xlarge/bools.xml deleted file mode 100644 index 9fb670c54..000000000 --- a/java/res/values-xlarge/bools.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<resources> - <!-- Whether or not Popup on key press is enabled by default --> - <bool name="default_popup_preview">false</bool> - <bool name="config_enable_show_settings_key_option">false</bool> - <bool name="config_enable_show_subtype_settings">false</bool> - <bool name="config_enable_show_voice_key_option">false</bool> - <bool name="config_candidate_highlight_font_color_enabled">false</bool> -</resources> diff --git a/java/res/values-xlarge/config.xml b/java/res/values-xlarge/config.xml index 0a1d4e48d..26c23dd1c 100644 --- a/java/res/values-xlarge/config.xml +++ b/java/res/values-xlarge/config.xml @@ -19,5 +19,12 @@ --> <resources> + <bool name="config_enable_show_settings_key_option">false</bool> + <bool name="config_enable_show_subtype_settings">false</bool> + <bool name="config_enable_show_voice_key_option">false</bool> + <bool name="config_candidate_highlight_font_color_enabled">false</bool> + <!-- Whether or not Popup on key press is enabled by default --> + <bool name="config_default_popup_preview">false</bool> <string name="config_text_size_of_language_on_spacebar">medium</string> + <integer name="config_max_popup_keyboard_column">9</integer> </resources> diff --git a/java/res/values-zh-rCN/donottranslate-altchars.xml b/java/res/values-zh-rCN/donottranslate-altchars.xml deleted file mode 100644 index c165b11c5..000000000 --- a/java/res/values-zh-rCN/donottranslate-altchars.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<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_s">§ß</string> - <string name="alternates_for_n">ñ</string> - <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</string> -</resources> diff --git a/java/res/values-zh-rTW/donottranslate-altchars.xml b/java/res/values-zh-rTW/donottranslate-altchars.xml deleted file mode 100644 index c165b11c5..000000000 --- a/java/res/values-zh-rTW/donottranslate-altchars.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<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_s">§ß</string> - <string name="alternates_for_n">ñ</string> - <string name="alternates_for_c">ç</string> - <string name="alternates_for_y">ýÿ</string> -</resources> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 55c806ca4..549c2ae81 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -89,15 +89,17 @@ <attr name="horizontalGap" format="dimension|fraction" /> <!-- Default vertical gap between rows of keys. --> <attr name="verticalGap" format="dimension|fraction" /> + <!-- Popup keyboard layout template --> + <attr name="popupKeyboardTemplate" format="reference" /> </declare-styleable> <declare-styleable name="Keyboard_Key"> <!-- The unicode value or comma-separated values that this key outputs. --> <attr name="codes" format="integer|string" /> - <!-- The XML keyboard layout of any popup keyboard. --> - <attr name="popupKeyboard" format="reference" /> <!-- The characters to display in the popup keyboard. --> <attr name="popupCharacters" format="string" /> + <!-- Maximum column of popup keyboard --> + <attr name="maxPopupKeyboardColumn" format="integer" /> <!-- Key edge flags. --> <attr name="keyEdgeFlags"> <!-- Key is anchored to the left of the keyboard. --> diff --git a/java/res/values/bools.xml b/java/res/values/bools.xml index 8742676ad..2a181e17d 100644 --- a/java/res/values/bools.xml +++ b/java/res/values/bools.xml @@ -18,20 +18,9 @@ */ --> <resources> - <!-- Whether or not auto-correction should be enabled by default --> - <bool name="enable_autocorrect">true</bool> <!-- Whether this input method should be used as the default for a locale. Override it for latin languages. --> <bool name="im_is_default">false</bool> <!-- Whether or not voice input is enabled by default. --> <bool name="voice_input_default">true</bool> - <bool name="config_swipeDisambiguation">true</bool> - <!-- Whether or not Popup on key press is enabled by default --> - <bool name="default_popup_preview">true</bool> - <bool name="default_recorrection_enabled">true</bool> - <bool name="config_long_press_comma_for_settings_enabled">true</bool> - <bool name="config_enable_show_settings_key_option">true</bool> - <bool name="config_enable_show_subtype_settings">true</bool> - <bool name="config_enable_show_voice_key_option">true</bool> - <bool name="config_candidate_highlight_font_color_enabled">true</bool> </resources> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 14b8d0060..d82960e15 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -19,6 +19,15 @@ --> <resources> + <bool name="config_swipeDisambiguation">true</bool> + <bool name="default_recorrection_enabled">true</bool> + <bool name="config_long_press_comma_for_settings_enabled">true</bool> + <bool name="config_enable_show_settings_key_option">true</bool> + <bool name="config_enable_show_subtype_settings">true</bool> + <bool name="config_enable_show_voice_key_option">true</bool> + <bool name="config_candidate_highlight_font_color_enabled">true</bool> + <!-- Whether or not Popup on key press is enabled by default --> + <bool name="config_default_popup_preview">true</bool> <integer name="config_delay_before_preview">0</integer> <integer name="config_delay_after_preview">10</integer> <integer name="config_preview_fadein_anim_time">0</integer> @@ -33,6 +42,9 @@ <integer name="config_long_press_shift_key_timeout">1200</integer> <integer name="config_multi_tap_key_timeout">800</integer> <string name="config_text_size_of_language_on_spacebar">small</string> + <integer name="config_max_popup_keyboard_column">9</integer> + <!-- Whether or not auto-correction should be enabled by default --> + <bool name="enable_autocorrect">true</bool> <string-array name="auto_correction_threshold_values"> <!-- Off, When auto correction setting is Off, this value is not used. --> <item></item> diff --git a/java/res/values/donottranslate-altchars.xml b/java/res/values/donottranslate-altchars.xml index de4250edf..85e06f23b 100644 --- a/java/res/values/donottranslate-altchars.xml +++ b/java/res/values/donottranslate-altchars.xml @@ -18,15 +18,15 @@ */ --> <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_s">§ß</string> + <string name="alternates_for_a">à,á,â,ã,ä,å,æ</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">1</string> <string name="alternates_for_w">2</string> <string name="alternates_for_d"></string> @@ -43,14 +43,13 @@ <string name="alternates_for_scandinavia_row2_11"></string> <string name="alternates_for_cyrillic_e"></string> <string name="alternates_for_cyrillic_soft_sign"></string> + <string name="alternates_for_mic">"\@drawable/sym_keyboard_settings|\@integer/key_settings,\@drawable/sym_keyboard_mic|\@integer/key_voice"</string> + <string name="alternates_for_smiley">":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\\\\\|:-\\\\\\\\ ,:\'(|:\'( ,:-D|:-D "</string> + <string name="alternates_for_settings_slash">"\@drawable/sym_keyboard_settings|\@integer/key_settings,/"</string> + <string name="alternates_for_settings_at">"\@drawable/sym_keyboard_settings|\@integer/key_settings,\@"</string> + <string name="alternates_for_settings_comma">"\@drawable/sym_keyboard_settings|\@integer/key_settings,\\,"</string> + <string name="alternates_for_punctuation">":,/,&,(,),-,+,;,\@,\',\",\?,!,\\,"</string> + <string name="keylabel_for_popular_domain">".com"</string> <!-- popular web domains for the locale - most popular, displayed on the keyboard --> - <string name="popular_domain_0">".com"</string> - <!-- popular web domains for the locale - item 1, displayed in the popup --> - <string name="popular_domain_1">".net"</string> - <!-- popular web domains for the locale - item 2, displayed in the popup --> - <string name="popular_domain_2">".org"</string> - <!-- popular web domains for the locale - item 3, displayed in the popup --> - <string name="popular_domain_3">".gov"</string> - <!-- popular web domains for the locale - item 4, displayed in the popup --> - <string name="popular_domain_4">".edu"</string> + <string name="alternates_for_popular_domain">".net,.org,.gov,.edu"</string> </resources> diff --git a/java/res/xml-da-xlarge/kbd_qwerty.xml b/java/res/xml-da-xlarge/kbd_qwerty.xml index 2852c765a..aa868e453 100644 --- a/java/res/xml-da-xlarge/kbd_qwerty.xml +++ b/java/res/xml-da-xlarge/kbd_qwerty.xml @@ -31,6 +31,8 @@ latin:rowHeight="25%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_qwerty_rows_scandinavia" /> diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml index 43215de2d..dfca1cdd2 100644 --- a/java/res/xml-da/kbd_qwerty.xml +++ b/java/res/xml-da/kbd_qwerty.xml @@ -32,6 +32,8 @@ latin:keyWidth="9.09%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_qwerty_rows_scandinavia" /> diff --git a/java/res/xml-de-xlarge/kbd_qwerty.xml b/java/res/xml-de-xlarge/kbd_qwerty.xml index 3c92b29a1..a23e4fbf0 100644 --- a/java/res/xml-de-xlarge/kbd_qwerty.xml +++ b/java/res/xml-de-xlarge/kbd_qwerty.xml @@ -26,6 +26,8 @@ latin:keyWidth="10%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_qwertz_rows" /> diff --git a/java/res/xml-de/kbd_qwerty.xml b/java/res/xml-de/kbd_qwerty.xml index 3c92b29a1..a23e4fbf0 100644 --- a/java/res/xml-de/kbd_qwerty.xml +++ b/java/res/xml-de/kbd_qwerty.xml @@ -26,6 +26,8 @@ latin:keyWidth="10%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_qwertz_rows" /> diff --git a/java/res/xml-fr-rCA-xlarge/kbd_qwerty.xml b/java/res/xml-fr-rCA-xlarge/kbd_qwerty.xml index b102eb603..92d92f0e6 100644 --- a/java/res/xml-fr-rCA-xlarge/kbd_qwerty.xml +++ b/java/res/xml-fr-rCA-xlarge/kbd_qwerty.xml @@ -26,6 +26,8 @@ latin:keyWidth="10%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_qwerty_rows" /> diff --git a/java/res/xml-fr-rCA/kbd_qwerty.xml b/java/res/xml-fr-rCA/kbd_qwerty.xml index b102eb603..92d92f0e6 100644 --- a/java/res/xml-fr-rCA/kbd_qwerty.xml +++ b/java/res/xml-fr-rCA/kbd_qwerty.xml @@ -26,6 +26,8 @@ latin:keyWidth="10%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_qwerty_rows" /> diff --git a/java/res/xml-fr-rCH-xlarge/kbd_qwerty.xml b/java/res/xml-fr-rCH-xlarge/kbd_qwerty.xml index 3c92b29a1..a23e4fbf0 100644 --- a/java/res/xml-fr-rCH-xlarge/kbd_qwerty.xml +++ b/java/res/xml-fr-rCH-xlarge/kbd_qwerty.xml @@ -26,6 +26,8 @@ latin:keyWidth="10%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_qwertz_rows" /> diff --git a/java/res/xml-fr-rCH/kbd_qwerty.xml b/java/res/xml-fr-rCH/kbd_qwerty.xml index 3c92b29a1..a23e4fbf0 100644 --- a/java/res/xml-fr-rCH/kbd_qwerty.xml +++ b/java/res/xml-fr-rCH/kbd_qwerty.xml @@ -26,6 +26,8 @@ latin:keyWidth="10%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_qwertz_rows" /> diff --git a/java/res/xml-fr-xlarge/kbd_qwerty.xml b/java/res/xml-fr-xlarge/kbd_qwerty.xml index a94384324..2d0b42baf 100644 --- a/java/res/xml-fr-xlarge/kbd_qwerty.xml +++ b/java/res/xml-fr-xlarge/kbd_qwerty.xml @@ -26,6 +26,8 @@ latin:keyWidth="10%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_azerty_rows" /> diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml index a94384324..2d0b42baf 100644 --- a/java/res/xml-fr/kbd_qwerty.xml +++ b/java/res/xml-fr/kbd_qwerty.xml @@ -26,6 +26,8 @@ latin:keyWidth="10%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_azerty_rows" /> diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml index 7d7774efe..98bfd7e0b 100644 --- a/java/res/xml-iw/kbd_qwerty.xml +++ b/java/res/xml-iw/kbd_qwerty.xml @@ -26,6 +26,8 @@ latin:keyWidth="10%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> diff --git a/java/res/xml-nb-xlarge/kbd_qwerty.xml b/java/res/xml-nb-xlarge/kbd_qwerty.xml index e64796628..5dfdc4f56 100644 --- a/java/res/xml-nb-xlarge/kbd_qwerty.xml +++ b/java/res/xml-nb-xlarge/kbd_qwerty.xml @@ -31,6 +31,8 @@ latin:rowHeight="25%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_qwerty_rows_scandinavia" /> diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml index 2985354e5..06f1b947a 100644 --- a/java/res/xml-nb/kbd_qwerty.xml +++ b/java/res/xml-nb/kbd_qwerty.xml @@ -32,6 +32,8 @@ latin:keyWidth="9.09%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_qwerty_rows_scandinavia" /> diff --git a/java/res/xml-ru-xlarge/kbd_qwerty.xml b/java/res/xml-ru-xlarge/kbd_qwerty.xml index 10f02415b..b86002a31 100644 --- a/java/res/xml-ru-xlarge/kbd_qwerty.xml +++ b/java/res/xml-ru-xlarge/kbd_qwerty.xml @@ -26,6 +26,8 @@ latin:keyWidth="9.091%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> @@ -40,43 +42,33 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="й" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="1" /> <Key latin:keyLabel="ц" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="2" /> <Key latin:keyLabel="у" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="3" /> <Key latin:keyLabel="к" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="4" /> <Key latin:keyLabel="е" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_cyrillic_e" /> <Key latin:keyLabel="н" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="6" /> <Key latin:keyLabel="г" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="7" /> <Key latin:keyLabel="ш" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="8" /> <Key latin:keyLabel="щ" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="9" /> <Key latin:keyLabel="з" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="0" /> <Key latin:keyLabel="х" /> @@ -141,7 +133,6 @@ latin:keyLabel="т" /> <Key latin:keyLabel="ь" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_cyrillic_soft_sign" /> <Key latin:keyLabel="б" /> diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml index b96c958c7..08d7a4ac5 100644 --- a/java/res/xml-ru/kbd_qwerty.xml +++ b/java/res/xml-ru/kbd_qwerty.xml @@ -26,6 +26,8 @@ latin:keyWidth="9.091%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> @@ -35,54 +37,44 @@ <Key latin:keyLabel="й" latin:keyHintIcon="@drawable/keyboard_hint_1" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="1" latin:keyWidth="8.75%p" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="ц" latin:keyHintIcon="@drawable/keyboard_hint_2" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="2" /> <Key latin:keyLabel="у" latin:keyHintIcon="@drawable/keyboard_hint_3" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="3" /> <Key latin:keyLabel="к" latin:keyHintIcon="@drawable/keyboard_hint_4" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="4" /> <Key latin:keyLabel="е" latin:keyHintIcon="@drawable/keyboard_hint_5" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_cyrillic_e" /> <Key latin:keyLabel="н" latin:keyHintIcon="@drawable/keyboard_hint_6" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="6" /> <Key latin:keyLabel="г" latin:keyHintIcon="@drawable/keyboard_hint_7" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="7" /> <Key latin:keyLabel="ш" latin:keyHintIcon="@drawable/keyboard_hint_8" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="8" /> <Key latin:keyLabel="щ" latin:keyHintIcon="@drawable/keyboard_hint_9" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="9" /> <Key latin:keyLabel="з" latin:keyHintIcon="@drawable/keyboard_hint_0" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="0" /> <Key latin:keyLabel="х" @@ -138,7 +130,6 @@ latin:keyLabel="т" /> <Key latin:keyLabel="ь" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_cyrillic_soft_sign" /> <Key latin:keyLabel="б" /> diff --git a/java/res/xml-sr-xlarge/kbd_qwerty.xml b/java/res/xml-sr-xlarge/kbd_qwerty.xml index 7290c13a0..48764e7c7 100644 --- a/java/res/xml-sr-xlarge/kbd_qwerty.xml +++ b/java/res/xml-sr-xlarge/kbd_qwerty.xml @@ -27,6 +27,8 @@ latin:keyWidth="9.09%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> @@ -41,43 +43,33 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="љ" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="1" /> <Key latin:keyLabel="њ" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="2" /> <Key latin:keyLabel="е" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="3" /> <Key latin:keyLabel="р" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="4" /> <Key latin:keyLabel="т" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="5" /> <Key latin:keyLabel="з" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="6" /> <Key latin:keyLabel="у" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="7" /> <Key latin:keyLabel="и" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="8" /> <Key latin:keyLabel="о" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="9" /> <Key latin:keyLabel="п" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="0" /> <Key latin:keyLabel="ш" /> @@ -149,14 +141,12 @@ latin:manualTemporaryUpperCaseCode="33" latin:keyHintIcon="@drawable/key_hint_exclamation_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="!" /> <Key latin:keyLabel="." latin:manualTemporaryUpperCaseCode="63" latin:keyHintIcon="@drawable/key_hint_question_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="\?" /> <Key latin:keyStyle="shiftKeyStyle" diff --git a/java/res/xml-sr/kbd_qwerty.xml b/java/res/xml-sr/kbd_qwerty.xml index aa025b2cb..0e5f5ff79 100644 --- a/java/res/xml-sr/kbd_qwerty.xml +++ b/java/res/xml-sr/kbd_qwerty.xml @@ -27,6 +27,8 @@ latin:keyWidth="9.09%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> @@ -36,53 +38,43 @@ <Key latin:keyLabel="љ" latin:keyHintIcon="@drawable/keyboard_hint_1" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="1" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="њ" latin:keyHintIcon="@drawable/keyboard_hint_2" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="2" /> <Key latin:keyLabel="е" latin:keyHintIcon="@drawable/keyboard_hint_3" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="3" /> <Key latin:keyLabel="р" latin:keyHintIcon="@drawable/keyboard_hint_4" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="4" /> <Key latin:keyLabel="т" latin:keyHintIcon="@drawable/keyboard_hint_5" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="5" /> <Key latin:keyLabel="з" latin:keyHintIcon="@drawable/keyboard_hint_6" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="6" /> <Key latin:keyLabel="у" latin:keyHintIcon="@drawable/keyboard_hint_7" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="7" /> <Key latin:keyLabel="и" latin:keyHintIcon="@drawable/keyboard_hint_8" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="8" /> <Key latin:keyLabel="о" latin:keyHintIcon="@drawable/keyboard_hint_9" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="9" /> <Key latin:keyLabel="п" latin:keyHintIcon="@drawable/keyboard_hint_0" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="0" /> <Key latin:keyLabel="ш" diff --git a/java/res/xml-sv-xlarge/kbd_qwerty.xml b/java/res/xml-sv-xlarge/kbd_qwerty.xml index b6c80ad87..bbb38585e 100644 --- a/java/res/xml-sv-xlarge/kbd_qwerty.xml +++ b/java/res/xml-sv-xlarge/kbd_qwerty.xml @@ -33,6 +33,8 @@ latin:rowHeight="25%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_qwerty_rows_scandinavia" /> diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml index b3d1b8784..60d3b45f9 100644 --- a/java/res/xml-sv/kbd_qwerty.xml +++ b/java/res/xml-sv/kbd_qwerty.xml @@ -34,6 +34,8 @@ latin:keyWidth="9.09%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_qwerty_rows_scandinavia" /> diff --git a/java/res/xml-xlarge-land/popup_domains.xml b/java/res/xml-xlarge-land/popup_domains.xml deleted file mode 100644 index 03a3846f9..000000000 --- a/java/res/xml-xlarge-land/popup_domains.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="4.0%p" - latin:horizontalGap="0px" - latin:verticalGap="0px" - latin:rowHeight="@dimen/popup_key_height" -> - <Row - latin:rowEdgeFlags="top|bottom" - > - <Key - latin:keyLabel="@string/popular_domain_1" - latin:keyOutputText="@string/popular_domain_1" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="@string/popular_domain_2" - latin:keyOutputText="@string/popular_domain_2" /> - <Key - latin:keyLabel="@string/popular_domain_3" - latin:keyOutputText="@string/popular_domain_3" /> - <Key - latin:keyLabel="@string/popular_domain_4" - latin:keyOutputText="@string/popular_domain_4" - latin:keyEdgeFlags="right" /> - </Row> -</Keyboard> diff --git a/java/res/xml-xlarge-land/popup_smileys.xml b/java/res/xml-xlarge-land/popup_smileys.xml deleted file mode 100644 index cc4acb06e..000000000 --- a/java/res/xml-xlarge-land/popup_smileys.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="4.0%p" - latin:horizontalGap="0px" - latin:verticalGap="0px" - latin:rowHeight="@dimen/popup_key_height" -> - <Row - latin:rowEdgeFlags="top" - > - <Key - latin:keyLabel=":-)" - latin:keyOutputText=":-) " - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel=":-(" - latin:keyOutputText=":-( " /> - <Key - latin:keyLabel=";-)" - latin:keyOutputText=";-) " /> - <Key - latin:keyLabel=":-P" - latin:keyOutputText=":-P " /> - <Key - latin:keyLabel="=-O" - latin:keyOutputText="=-O " - latin:keyEdgeFlags="right" /> - </Row> - <Row> - <Key - latin:keyLabel=":-*" - latin:keyOutputText=":-* " - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel=":O" - latin:keyOutputText=":O " /> - <Key - latin:keyLabel="B-)" - latin:keyOutputText="B-) " /> - <Key - latin:keyLabel=":-$" - latin:keyOutputText=":-$ " /> - <Key - latin:keyLabel=":-!" - latin:keyOutputText=":-! " - latin:keyEdgeFlags="right" /> - </Row> - <Row - latin:rowEdgeFlags="bottom" - > - <Key - latin:keyLabel=":-[" - latin:keyOutputText=":-[ " - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="O:-)" - latin:keyOutputText="O:-) " /> - <Key - latin:keyLabel=":-\\" - latin:keyOutputText=":-\\ " /> - <Key - latin:keyLabel=":'(" - latin:keyOutputText=":'( " /> - <Key - latin:keyLabel=":-D" - latin:keyOutputText=":-D " - latin:keyEdgeFlags="right" /> - </Row> -</Keyboard> diff --git a/java/res/xml-xlarge/kbd_azerty_rows.xml b/java/res/xml-xlarge/kbd_azerty_rows.xml index b68e21481..616295065 100644 --- a/java/res/xml-xlarge/kbd_azerty_rows.xml +++ b/java/res/xml-xlarge/kbd_azerty_rows.xml @@ -33,43 +33,33 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="a" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_a" /> <Key latin:keyLabel="z" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_z" /> <Key latin:keyLabel="e" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_e" /> <Key latin:keyLabel="r" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_r" /> <Key latin:keyLabel="t" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_t" /> <Key latin:keyLabel="y" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_y" /> <Key latin:keyLabel="u" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_u" /> <Key latin:keyLabel="i" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_i" /> <Key latin:keyLabel="o" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_o" /> <Key latin:keyLabel="p" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_p" /> <Key latin:keyStyle="deleteKeyStyle" @@ -86,21 +76,17 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="q" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_q" /> <Key latin:keyLabel="s" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_s" /> <Key latin:keyLabel="d" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_g" /> <Key latin:keyLabel="h" /> @@ -110,7 +96,6 @@ latin:keyLabel="k" /> <Key latin:keyLabel="l" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_l" /> <Key latin:keyLabel="m" @@ -129,30 +114,25 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="w" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_w" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_c" /> <Key latin:keyLabel="v" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_n" /> <Key latin:keyLabel="\'" latin:manualTemporaryUpperCaseCode="58" latin:keyHintIcon="@drawable/key_hint_colon_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters=":" /> <switch> <case @@ -169,14 +149,12 @@ latin:manualTemporaryUpperCaseCode="33" latin:keyHintIcon="@drawable/key_hint_exclamation_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="!" /> <Key latin:keyLabel="." latin:manualTemporaryUpperCaseCode="63" latin:keyHintIcon="@drawable/key_hint_question_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="\?" /> </default> </switch> diff --git a/java/res/xml-xlarge/kbd_key_styles.xml b/java/res/xml-xlarge/kbd_key_styles.xml index be4611195..6c1df0b9e 100644 --- a/java/res/xml-xlarge/kbd_key_styles.xml +++ b/java/res/xml-xlarge/kbd_key_styles.xml @@ -62,11 +62,11 @@ latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> <key-style latin:styleName="smileyKeyStyle" - latin:codes="0" latin:keyIcon="@drawable/sym_keyboard_smiley_holo" latin:keyOutputText=";-) " latin:keyHintIcon="@drawable/hint_popup_holo" - latin:popupKeyboard="@xml/popup_smileys" /> + latin:popupCharacters="@string/alternates_for_smiley" + latin:maxPopupKeyboardColumn="5" /> <key-style latin:styleName="micKeyStyle" latin:codes="@integer/key_voice" @@ -115,7 +115,8 @@ latin:keyLabel=";-)" latin:keyOutputText=";-) " latin:keyHintIcon="@drawable/hint_popup_holo" - latin:popupKeyboard="@xml/popup_smileys" /> + latin:popupCharacters="@string/alternates_for_smiley" + latin:maxPopupKeyboardColumn="5" /> <key-style latin:styleName="micKeyStyle" latin:codes="@integer/key_voice" @@ -151,9 +152,9 @@ latin:isSticky="true" /> <key-style latin:styleName="comKeyStyle" - latin:keyLabel="@string/popular_domain_0" + latin:keyLabel="@string/keylabel_for_popular_domain" latin:keyLabelOption="fontNormal" - latin:keyOutputText="@string/popular_domain_0" + latin:keyOutputText="@string/keylabel_for_popular_domain" latin:keyHintIcon="@drawable/hint_popup_holo" - latin:popupKeyboard="@xml/popup_domains" /> + latin:popupCharacters="@string/alternates_for_popular_domain" /> </merge> diff --git a/java/res/xml-xlarge/kbd_number.xml b/java/res/xml-xlarge/kbd_number.xml index 11cf8fb86..93bc1363a 100644 --- a/java/res/xml-xlarge/kbd_number.xml +++ b/java/res/xml-xlarge/kbd_number.xml @@ -26,6 +26,8 @@ latin:keyWidth="11.949%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> diff --git a/java/res/xml-xlarge/kbd_phone.xml b/java/res/xml-xlarge/kbd_phone.xml index 6389a8ccd..66f602068 100644 --- a/java/res/xml-xlarge/kbd_phone.xml +++ b/java/res/xml-xlarge/kbd_phone.xml @@ -26,6 +26,8 @@ latin:keyWidth="11.949%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> diff --git a/java/res/xml-xlarge/kbd_phone_symbols.xml b/java/res/xml-xlarge/kbd_phone_symbols.xml index 59d8181f6..8c0df030d 100644 --- a/java/res/xml-xlarge/kbd_phone_symbols.xml +++ b/java/res/xml-xlarge/kbd_phone_symbols.xml @@ -26,6 +26,8 @@ latin:keyWidth="11.949%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> diff --git a/java/res/xml-xlarge/kbd_qwerty.xml b/java/res/xml-xlarge/kbd_qwerty.xml index 75fe183a3..1c8d51ffe 100644 --- a/java/res/xml-xlarge/kbd_qwerty.xml +++ b/java/res/xml-xlarge/kbd_qwerty.xml @@ -25,6 +25,8 @@ latin:rowHeight="25%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_qwerty_rows" /> diff --git a/java/res/xml-xlarge/kbd_qwerty_row1.xml b/java/res/xml-xlarge/kbd_qwerty_row1.xml index 159686792..f5135591c 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row1.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row1.xml @@ -32,43 +32,33 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="q" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_q" /> <Key latin:keyLabel="w" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_w" /> <Key latin:keyLabel="e" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_e" /> <Key latin:keyLabel="r" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_r" /> <Key latin:keyLabel="t" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_t" /> <Key latin:keyLabel="y" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_y" /> <Key latin:keyLabel="u" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_u" /> <Key latin:keyLabel="i" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_i" /> <Key latin:keyLabel="o" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_o" /> <Key latin:keyLabel="p" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_p" /> <Key latin:keyStyle="deleteKeyStyle" diff --git a/java/res/xml-xlarge/kbd_qwerty_row2.xml b/java/res/xml-xlarge/kbd_qwerty_row2.xml index 2b9be10ab..1b4393ab2 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row2.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row2.xml @@ -31,21 +31,17 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="a" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_a" /> <Key latin:keyLabel="s" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_s" /> <Key latin:keyLabel="d" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_g" /> <Key latin:keyLabel="h" /> @@ -55,7 +51,6 @@ latin:keyLabel="k" /> <Key latin:keyLabel="l" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_l" /> <Key latin:keyStyle="returnKeyStyle" diff --git a/java/res/xml-xlarge/kbd_qwerty_row3.xml b/java/res/xml-xlarge/kbd_qwerty_row3.xml index 209ef213d..b7e9bcff9 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row3.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row3.xml @@ -30,23 +30,19 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="z" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_z" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_c" /> <Key latin:keyLabel="v" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_n" /> <Key latin:keyLabel="m" /> @@ -65,14 +61,12 @@ latin:manualTemporaryUpperCaseCode="33" latin:keyHintIcon="@drawable/key_hint_exclamation_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="!" /> <Key latin:keyLabel="." latin:manualTemporaryUpperCaseCode="63" latin:keyHintIcon="@drawable/key_hint_question_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="\?" /> </default> </switch> diff --git a/java/res/xml-xlarge/kbd_qwerty_row4.xml b/java/res/xml-xlarge/kbd_qwerty_row4.xml index 205f2e0e3..e222a6bb0 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row4.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row4.xml @@ -54,7 +54,6 @@ latin:manualTemporaryUpperCaseCode="43" latin:keyHintIcon="@drawable/key_hint_plus_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_plus_large_holo" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="+" /> </case> <default> @@ -67,7 +66,6 @@ latin:manualTemporaryUpperCaseCode="64" latin:keyHintIcon="@drawable/key_hint_at_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="\@" /> </default> </switch> @@ -89,7 +87,6 @@ latin:manualTemporaryUpperCaseCode="58" latin:keyHintIcon="@drawable/key_hint_colon_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters=":" /> </case> <default> @@ -98,7 +95,6 @@ latin:manualTemporaryUpperCaseCode="34" latin:keyHintIcon="@drawable/key_hint_quote_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters=""" /> </default> </switch> @@ -115,7 +111,6 @@ latin:manualTemporaryUpperCaseCode="95" latin:keyHintIcon="@drawable/key_hint_underline_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="_" /> </default> </switch> diff --git a/java/res/xml-xlarge/kbd_qwerty_rows_scandinavia.xml b/java/res/xml-xlarge/kbd_qwerty_rows_scandinavia.xml index c56d4f497..8c583ba85 100644 --- a/java/res/xml-xlarge/kbd_qwerty_rows_scandinavia.xml +++ b/java/res/xml-xlarge/kbd_qwerty_rows_scandinavia.xml @@ -33,43 +33,33 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="q" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_q" /> <Key latin:keyLabel="w" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_w" /> <Key latin:keyLabel="e" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_e" /> <Key latin:keyLabel="r" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_r" /> <Key latin:keyLabel="t" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_t" /> <Key latin:keyLabel="y" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_y" /> <Key latin:keyLabel="u" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_u" /> <Key latin:keyLabel="i" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_i" /> <Key latin:keyLabel="o" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_o" /> <Key latin:keyLabel="p" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_p" /> <Key latin:keyLabel="å" /> @@ -88,21 +78,17 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="a" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_a" /> <Key latin:keyLabel="s" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_s" /> <Key latin:keyLabel="d" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_g" /> <Key latin:keyLabel="h" /> @@ -112,15 +98,12 @@ latin:keyLabel="k" /> <Key latin:keyLabel="l" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_l" /> <Key latin:keyLabel="@string/keylabel_for_scandinavia_row2_10" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_scandinavia_row2_10" /> <Key latin:keyLabel="@string/keylabel_for_scandinavia_row2_11" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_scandinavia_row2_11" /> <Key latin:keyStyle="returnKeyStyle" diff --git a/java/res/xml-xlarge/kbd_qwertz_rows.xml b/java/res/xml-xlarge/kbd_qwertz_rows.xml index de15b5fd6..3e99f0511 100644 --- a/java/res/xml-xlarge/kbd_qwertz_rows.xml +++ b/java/res/xml-xlarge/kbd_qwertz_rows.xml @@ -33,43 +33,33 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="q" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_q" /> <Key latin:keyLabel="w" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_w" /> <Key latin:keyLabel="e" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_e" /> <Key latin:keyLabel="r" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_r" /> <Key latin:keyLabel="t" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_t" /> <Key latin:keyLabel="z" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_z" /> <Key latin:keyLabel="u" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_u" /> <Key latin:keyLabel="i" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_i" /> <Key latin:keyLabel="o" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_o" /> <Key latin:keyLabel="p" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_p" /> <Key latin:keyStyle="deleteKeyStyle" @@ -87,23 +77,19 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="y" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_y" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_c" /> <Key latin:keyLabel="v" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_n" /> <Key latin:keyLabel="m" /> @@ -122,14 +108,12 @@ latin:manualTemporaryUpperCaseCode="33" latin:keyHintIcon="@drawable/key_hint_exclamation_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="!" /> <Key latin:keyLabel="." latin:manualTemporaryUpperCaseCode="63" latin:keyHintIcon="@drawable/key_hint_question_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="\?" /> </default> </switch> diff --git a/java/res/xml-xlarge/kbd_symbols.xml b/java/res/xml-xlarge/kbd_symbols.xml index f78af8abd..50b8e5307 100644 --- a/java/res/xml-xlarge/kbd_symbols.xml +++ b/java/res/xml-xlarge/kbd_symbols.xml @@ -25,6 +25,8 @@ latin:rowHeight="25%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> @@ -39,29 +41,23 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="1" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="¹½⅓¼⅛" /> + latin:popupCharacters="¹,½,⅓,¼,⅛" /> <Key latin:keyLabel="2" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="²⅔" /> + latin:popupCharacters="²,⅔" /> <Key latin:keyLabel="3" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="³¾⅜" /> + latin:popupCharacters="³,¾,⅜" /> <Key latin:keyLabel="4" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="⁴" /> <Key latin:keyLabel="5" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="⅝" /> <Key latin:keyLabel="6" /> <Key latin:keyLabel="7" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="⅞" /> <Key latin:keyLabel="8" /> @@ -69,8 +65,7 @@ latin:keyLabel="9" /> <Key latin:keyLabel="0" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="ⁿ∅" /> + latin:popupCharacters="ⁿ,∅" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="9.331%p" @@ -88,34 +83,27 @@ latin:keyLabel="#" /> <Key latin:keyLabel="$" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="¢£€¥₣₤₱" /> + latin:popupCharacters="¢,£,€,¥,₣,₤,₱" /> <Key latin:keyLabel="%" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="‰" /> <Key latin:keyLabel="&" /> <Key latin:keyLabel="*" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="†‡★" /> + latin:popupCharacters="†,‡,★" /> <Key latin:keyLabel="-" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="_–—" /> + latin:popupCharacters="_,–,—" /> <Key latin:keyLabel="+" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="±" /> <Key latin:keyLabel="(" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="[{<" /> + latin:popupCharacters="[,{,<" /> <Key latin:keyLabel=")" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="]}>" /> + latin:popupCharacters="],},>" /> <Key latin:keyStyle="returnKeyStyle" latin:keyWidth="15.750%p" @@ -130,16 +118,13 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="<" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="≤«‹" /> + latin:popupCharacters="≤,«,‹" /> <Key latin:keyLabel=">" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="≥»›" /> + latin:popupCharacters="≥,»,›" /> <Key latin:keyLabel="=" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="≠≈" /> + latin:popupCharacters="≠,≈" /> <Key latin:keyLabel=":" /> <Key @@ -150,11 +135,9 @@ latin:keyLabel="." /> <Key latin:keyLabel="!" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="¡" /> <Key latin:keyLabel="\?" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="¿" /> <Key latin:keyStyle="moreKeyStyle" @@ -176,8 +159,7 @@ latin:keyWidth="37.454%p" /> <Key latin:keyLabel=""" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="“”«»˝" /> + latin:popupCharacters="“,”,«,»,˝" /> <Key latin:keyLabel="_" /> <Key diff --git a/java/res/xml-xlarge/kbd_symbols_shift.xml b/java/res/xml-xlarge/kbd_symbols_shift.xml index f3fbf36d1..f586b1a28 100644 --- a/java/res/xml-xlarge/kbd_symbols_shift.xml +++ b/java/res/xml-xlarge/kbd_symbols_shift.xml @@ -25,6 +25,8 @@ latin:rowHeight="25%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> @@ -45,13 +47,11 @@ latin:keyLabel="|" /> <Key latin:keyLabel="•" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="♪♥♠♦♣" /> + latin:popupCharacters="♪,♥,♠,♦,♣" /> <Key latin:keyLabel="√" /> <Key latin:keyLabel="π" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="Π" /> <Key latin:keyLabel="÷" /> @@ -59,7 +59,6 @@ latin:keyLabel="×" /> <Key latin:keyLabel="§" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="¶" /> <Key latin:keyLabel="Δ" /> @@ -86,13 +85,11 @@ latin:keyLabel="¥" /> <Key latin:keyLabel="^" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="↑↓←→" /> + latin:popupCharacters="↑,↓,←,→" /> <Key latin:keyLabel="°" /> <Key latin:keyLabel="±" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="∞" /> <Key latin:keyLabel="{" /> diff --git a/java/res/xml-xlarge/popup_domains.xml b/java/res/xml-xlarge/popup_domains.xml deleted file mode 100644 index 6d65c898b..000000000 --- a/java/res/xml-xlarge/popup_domains.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="5.5%p" - latin:horizontalGap="0px" - latin:verticalGap="0px" - latin:rowHeight="@dimen/popup_key_height" -> - <Row - latin:rowEdgeFlags="top|bottom" - > - <Key - latin:keyLabel="@string/popular_domain_1" - latin:keyOutputText="@string/popular_domain_1" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="@string/popular_domain_2" - latin:keyOutputText="@string/popular_domain_2" /> - <Key - latin:keyLabel="@string/popular_domain_3" - latin:keyOutputText="@string/popular_domain_3" /> - <Key - latin:keyLabel="@string/popular_domain_4" - latin:keyOutputText="@string/popular_domain_4" - latin:keyEdgeFlags="right" /> - </Row> -</Keyboard> diff --git a/java/res/xml-xlarge/popup_smileys.xml b/java/res/xml-xlarge/popup_smileys.xml deleted file mode 100644 index 552dc42a7..000000000 --- a/java/res/xml-xlarge/popup_smileys.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="5.0%p" - latin:horizontalGap="0px" - latin:verticalGap="0px" - latin:rowHeight="@dimen/popup_key_height" -> - <Row - latin:rowEdgeFlags="top" - > - <Key - latin:keyLabel=":-)" - latin:keyOutputText=":-) " - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel=":-(" - latin:keyOutputText=":-( " /> - <Key - latin:keyLabel=";-)" - latin:keyOutputText=";-) " /> - <Key - latin:keyLabel=":-P" - latin:keyOutputText=":-P " /> - <Key - latin:keyLabel="=-O" - latin:keyOutputText="=-O " - latin:keyEdgeFlags="right" /> - </Row> - <Row> - <Key - latin:keyLabel=":-*" - latin:keyOutputText=":-* " - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel=":O" - latin:keyOutputText=":O " /> - <Key - latin:keyLabel="B-)" - latin:keyOutputText="B-) " /> - <Key - latin:keyLabel=":-$" - latin:keyOutputText=":-$ " /> - <Key - latin:keyLabel=":-!" - latin:keyOutputText=":-! " - latin:keyEdgeFlags="right" /> - </Row> - <Row - latin:rowEdgeFlags="bottom" - > - <Key - latin:keyLabel=":-[" - latin:keyOutputText=":-[ " - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="O:-)" - latin:keyOutputText="O:-) " /> - <Key - latin:keyLabel=":-\\" - latin:keyOutputText=":-\\ " /> - <Key - latin:keyLabel=":'(" - latin:keyOutputText=":'( " /> - <Key - latin:keyLabel=":-D" - latin:keyOutputText=":-D " - latin:keyEdgeFlags="right" /> - </Row> -</Keyboard> diff --git a/java/res/xml/kbd_azerty_rows.xml b/java/res/xml/kbd_azerty_rows.xml index c06724c49..71109ab67 100644 --- a/java/res/xml/kbd_azerty_rows.xml +++ b/java/res/xml/kbd_azerty_rows.xml @@ -30,53 +30,43 @@ <Key latin:keyLabel="a" latin:keyHintIcon="@drawable/keyboard_hint_1" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_a" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="z" latin:keyHintIcon="@drawable/keyboard_hint_2" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_z" /> <Key latin:keyLabel="e" latin:keyHintIcon="@drawable/keyboard_hint_3" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_e" /> <Key latin:keyLabel="r" latin:keyHintIcon="@drawable/keyboard_hint_4" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_r" /> <Key latin:keyLabel="t" latin:keyHintIcon="@drawable/keyboard_hint_5" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_t" /> <Key latin:keyLabel="y" latin:keyHintIcon="@drawable/keyboard_hint_6" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_y" /> <Key latin:keyLabel="u" latin:keyHintIcon="@drawable/keyboard_hint_7" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_u" /> <Key latin:keyLabel="i" latin:keyHintIcon="@drawable/keyboard_hint_8" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_i" /> <Key latin:keyLabel="o" latin:keyHintIcon="@drawable/keyboard_hint_9" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_o" /> <Key latin:keyLabel="p" latin:keyHintIcon="@drawable/keyboard_hint_0" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_p" latin:keyEdgeFlags="right" /> </Row> @@ -85,22 +75,18 @@ > <Key latin:keyLabel="q" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_q" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="s" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_s" /> <Key latin:keyLabel="d" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_g" /> <Key latin:keyLabel="h" /> @@ -110,7 +96,6 @@ latin:keyLabel="k" /> <Key latin:keyLabel="l" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_l" /> <Key latin:keyLabel="m" @@ -125,23 +110,20 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="w" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_w" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_c" /> <Key latin:keyLabel="v" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_n" /> <Key latin:keyLabel="\'" /> diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml index 9dd166a41..3b6df7315 100644 --- a/java/res/xml/kbd_key_styles.xml +++ b/java/res/xml/kbd_key_styles.xml @@ -88,10 +88,10 @@ <key-style latin:styleName="micKeyStyle" latin:codes="@integer/key_voice" - latin:popupKeyboard="@xml/popup_mic" latin:keyIcon="@drawable/sym_keyboard_mic" latin:iconPreview="@drawable/sym_keyboard_feedback_mic" latin:keyHintIcon="@drawable/hint_popup" + latin:popupCharacters="@string/alternates_for_mic" latin:parentStyle="functionalKeyStyle" /> <!-- Note: This key style is not for functional tab key. This is used for the tab key which is laid out as normal letter key. --> @@ -165,10 +165,10 @@ <key-style latin:styleName="micKeyStyle" latin:codes="@integer/key_voice" - latin:popupKeyboard="@xml/popup_mic" latin:keyIcon="@drawable/sym_bkeyboard_mic" latin:iconPreview="@drawable/sym_keyboard_feedback_mic" latin:keyHintIcon="@drawable/hint_popup" + latin:popupCharacters="@string/alternates_for_mic" latin:parentStyle="functionalKeyStyle" /> <!-- Note: This key style is not for functional tab key. This is used for the tab key which is laid out as normal letter key. --> @@ -284,6 +284,7 @@ latin:keyLabel=":-)" latin:keyOutputText=":-) " latin:keyHintIcon="@drawable/hint_popup" - latin:popupKeyboard="@xml/popup_smileys" + latin:popupCharacters="@string/alternates_for_smiley" + latin:maxPopupKeyboardColumn="5" latin:parentStyle="functionalKeyStyle" /> </merge>
\ No newline at end of file diff --git a/java/res/xml/kbd_number.xml b/java/res/xml/kbd_number.xml index f09da8683..f4a5def95 100644 --- a/java/res/xml/kbd_number.xml +++ b/java/res/xml/kbd_number.xml @@ -26,10 +26,12 @@ latin:keyWidth="26.67%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> - <switch> + <switch> <case latin:colorScheme="white" > diff --git a/java/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml index fb0e6d7f2..62fbdeeec 100644 --- a/java/res/xml/kbd_phone.xml +++ b/java/res/xml/kbd_phone.xml @@ -26,6 +26,8 @@ latin:keyWidth="26.67%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> diff --git a/java/res/xml/kbd_phone_symbols.xml b/java/res/xml/kbd_phone_symbols.xml index 5f75ecb53..1997a75fc 100644 --- a/java/res/xml/kbd_phone_symbols.xml +++ b/java/res/xml/kbd_phone_symbols.xml @@ -26,6 +26,8 @@ latin:keyWidth="26.67%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml index b102eb603..92d92f0e6 100644 --- a/java/res/xml/kbd_qwerty.xml +++ b/java/res/xml/kbd_qwerty.xml @@ -26,6 +26,8 @@ latin:keyWidth="10%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_qwerty_rows" /> diff --git a/java/res/xml/kbd_qwerty_f1.xml b/java/res/xml/kbd_qwerty_f1.xml index 1f0ccfb98..cbdb8c09a 100644 --- a/java/res/xml/kbd_qwerty_f1.xml +++ b/java/res/xml/kbd_qwerty_f1.xml @@ -27,8 +27,8 @@ > <Key latin:keyLabel="/" - latin:popupKeyboard="@xml/popup_slash" latin:keyHintIcon="@drawable/hint_popup" + latin:popupCharacters="@string/alternates_for_settings_slash" latin:isModifier="true" /> </case> <case @@ -36,8 +36,8 @@ > <Key latin:keyLabel="\@" - latin:popupKeyboard="@xml/popup_at" latin:keyHintIcon="@drawable/hint_popup" + latin:popupCharacters="@string/alternates_for_settings_at" latin:isModifier="true" /> </case> <default> @@ -53,8 +53,8 @@ > <Key latin:keyLabel="," - latin:popupKeyboard="@xml/popup_comma" latin:keyHintIcon="@drawable/hint_popup" + latin:popupCharacters="@string/alternates_for_settings_comma" latin:isModifier="true" /> </case> </switch> diff --git a/java/res/xml/kbd_qwerty_row1.xml b/java/res/xml/kbd_qwerty_row1.xml index e4356a8ad..d9249657e 100644 --- a/java/res/xml/kbd_qwerty_row1.xml +++ b/java/res/xml/kbd_qwerty_row1.xml @@ -28,53 +28,43 @@ <Key latin:keyLabel="q" latin:keyHintIcon="@drawable/keyboard_hint_1" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_q" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="w" latin:keyHintIcon="@drawable/keyboard_hint_2" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_w" /> <Key latin:keyLabel="e" latin:keyHintIcon="@drawable/keyboard_hint_3" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_e" /> <Key latin:keyLabel="r" latin:keyHintIcon="@drawable/keyboard_hint_4" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_r" /> <Key latin:keyLabel="t" latin:keyHintIcon="@drawable/keyboard_hint_5" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_t" /> <Key latin:keyLabel="y" latin:keyHintIcon="@drawable/keyboard_hint_6" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_y" /> <Key latin:keyLabel="u" latin:keyHintIcon="@drawable/keyboard_hint_7" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_u" /> <Key latin:keyLabel="i" latin:keyHintIcon="@drawable/keyboard_hint_8" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_i" /> <Key latin:keyLabel="o" latin:keyHintIcon="@drawable/keyboard_hint_9" - latin:popupKeyboard="@xml/kbd_popup_narrow_template" latin:popupCharacters="@string/alternates_for_o" /> <Key latin:keyLabel="p" latin:keyHintIcon="@drawable/keyboard_hint_0" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_p" latin:keyEdgeFlags="right" /> </Row> diff --git a/java/res/xml/kbd_qwerty_row2.xml b/java/res/xml/kbd_qwerty_row2.xml index d5184954f..dd0035d93 100644 --- a/java/res/xml/kbd_qwerty_row2.xml +++ b/java/res/xml/kbd_qwerty_row2.xml @@ -28,22 +28,18 @@ latin:horizontalGap="5%p" /> <Key latin:keyLabel="a" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_a" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="s" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_s" /> <Key latin:keyLabel="d" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_g" /> <Key latin:keyLabel="h" /> @@ -53,7 +49,6 @@ latin:keyLabel="k" /> <Key latin:keyLabel="l" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_l" latin:keyEdgeFlags="right" /> </Row> diff --git a/java/res/xml/kbd_qwerty_row3.xml b/java/res/xml/kbd_qwerty_row3.xml index 71a5f9c4a..26608fd71 100644 --- a/java/res/xml/kbd_qwerty_row3.xml +++ b/java/res/xml/kbd_qwerty_row3.xml @@ -30,23 +30,19 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="z" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_z" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_c" /> <Key latin:keyLabel="v" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_n" /> <Key latin:keyLabel="m" /> diff --git a/java/res/xml/kbd_qwerty_row4.xml b/java/res/xml/kbd_qwerty_row4.xml index cd03c51fc..0db011672 100644 --- a/java/res/xml/kbd_qwerty_row4.xml +++ b/java/res/xml/kbd_qwerty_row4.xml @@ -55,7 +55,8 @@ <Key latin:keyLabel="." latin:keyHintIcon="@drawable/hint_popup" - latin:popupKeyboard="@xml/popup_punctuation" + latin:popupCharacters="@string/alternates_for_punctuation" + latin:maxPopupKeyboardColumn="7" latin:keyStyle="functionalKeyStyle" /> <switch> <case @@ -104,7 +105,8 @@ <Key latin:keyLabel="." latin:keyHintIcon="@drawable/hint_popup" - latin:popupKeyboard="@xml/popup_punctuation" + latin:popupCharacters="@string/alternates_for_punctuation" + latin:maxPopupKeyboardColumn="7" latin:keyStyle="functionalKeyStyle" /> <switch> <case diff --git a/java/res/xml/kbd_qwerty_rows_scandinavia.xml b/java/res/xml/kbd_qwerty_rows_scandinavia.xml index 4fa2e6eda..490652663 100644 --- a/java/res/xml/kbd_qwerty_rows_scandinavia.xml +++ b/java/res/xml/kbd_qwerty_rows_scandinavia.xml @@ -30,54 +30,44 @@ <Key latin:keyLabel="q" latin:keyHintIcon="@drawable/keyboard_hint_1" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_q" latin:keyWidth="8.75%p" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="w" latin:keyHintIcon="@drawable/keyboard_hint_2" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_w" /> <Key latin:keyLabel="e" latin:keyHintIcon="@drawable/keyboard_hint_3" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_e" /> <Key latin:keyLabel="r" latin:keyHintIcon="@drawable/keyboard_hint_4" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_r" /> <Key latin:keyLabel="t" latin:keyHintIcon="@drawable/keyboard_hint_5" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_t" /> <Key latin:keyLabel="y" latin:keyHintIcon="@drawable/keyboard_hint_6" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_y" /> <Key latin:keyLabel="u" latin:keyHintIcon="@drawable/keyboard_hint_7" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_u" /> <Key latin:keyLabel="i" latin:keyHintIcon="@drawable/keyboard_hint_8" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_i" /> <Key latin:keyLabel="o" latin:keyHintIcon="@drawable/keyboard_hint_9" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_o" /> <Key latin:keyLabel="p" latin:keyHintIcon="@drawable/keyboard_hint_0" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_p" /> <Key latin:keyLabel="å" @@ -89,23 +79,19 @@ > <Key latin:keyLabel="a" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_a" latin:keyWidth="8.75%p" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="s" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_s" /> <Key latin:keyLabel="d" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_g" /> <Key latin:keyLabel="h" /> @@ -115,15 +101,12 @@ latin:keyLabel="k" /> <Key latin:keyLabel="l" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_l" /> <Key latin:keyLabel="@string/keylabel_for_scandinavia_row2_10" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_scandinavia_row2_10" /> <Key latin:keyLabel="@string/keylabel_for_scandinavia_row2_11" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_scandinavia_row2_11" latin:keyWidth="8.75%p" latin:keyEdgeFlags="right" /> diff --git a/java/res/xml/kbd_qwertz_rows.xml b/java/res/xml/kbd_qwertz_rows.xml index 4dbb6412a..375f12335 100644 --- a/java/res/xml/kbd_qwertz_rows.xml +++ b/java/res/xml/kbd_qwertz_rows.xml @@ -30,53 +30,43 @@ <Key latin:keyLabel="q" latin:keyHintIcon="@drawable/keyboard_hint_1" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_q" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="w" latin:keyHintIcon="@drawable/keyboard_hint_2" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_w" /> <Key latin:keyLabel="e" latin:keyHintIcon="@drawable/keyboard_hint_3" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_e" /> <Key latin:keyLabel="r" latin:keyHintIcon="@drawable/keyboard_hint_4" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_r" /> <Key latin:keyLabel="t" latin:keyHintIcon="@drawable/keyboard_hint_5" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_t" /> <Key latin:keyLabel="z" latin:keyHintIcon="@drawable/keyboard_hint_6" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_z" /> <Key latin:keyLabel="u" latin:keyHintIcon="@drawable/keyboard_hint_7" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_u" /> <Key latin:keyLabel="i" latin:keyHintIcon="@drawable/keyboard_hint_8" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_i" /> <Key latin:keyLabel="o" latin:keyHintIcon="@drawable/keyboard_hint_9" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_o" /> <Key latin:keyLabel="p" latin:keyHintIcon="@drawable/keyboard_hint_0" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_p" latin:keyEdgeFlags="right" /> </Row> @@ -91,23 +81,19 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="y" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_y" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_c" /> <Key latin:keyLabel="v" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="@string/alternates_for_n" /> <Key latin:keyLabel="m" /> diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml index a7da01151..5d62deaa4 100644 --- a/java/res/xml/kbd_symbols.xml +++ b/java/res/xml/kbd_symbols.xml @@ -26,6 +26,8 @@ latin:keyWidth="10%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> @@ -34,30 +36,24 @@ > <Key latin:keyLabel="1" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="¹½⅓¼⅛" + latin:popupCharacters="¹,½,⅓,¼,⅛" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="2" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="²⅔" /> + latin:popupCharacters="²,⅔" /> <Key latin:keyLabel="3" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="³¾⅜" /> + latin:popupCharacters="³,¾,⅜" /> <Key latin:keyLabel="4" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="⁴" /> <Key latin:keyLabel="5" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="⅝" /> <Key latin:keyLabel="6" /> <Key latin:keyLabel="7" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="⅞" /> <Key latin:keyLabel="8" /> @@ -65,8 +61,7 @@ latin:keyLabel="9" /> <Key latin:keyLabel="0" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="ⁿ∅" + latin:popupCharacters="ⁿ,∅" latin:keyEdgeFlags="right" /> </Row> <Row> @@ -77,34 +72,27 @@ latin:keyLabel="\#" /> <Key latin:keyLabel="$" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="¢£€¥₣₤₱" /> + latin:popupCharacters="¢,£,€,¥,₣,₤,₱" /> <Key latin:keyLabel="%" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="‰" /> <Key latin:keyLabel="&" /> <Key latin:keyLabel="*" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="†‡★" /> + latin:popupCharacters="†,‡,★" /> <Key latin:keyLabel="-" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="_–—" /> + latin:popupCharacters="_,–,—" /> <Key latin:keyLabel="+" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="±" /> <Key latin:keyLabel="(" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="[{<" /> + latin:popupCharacters="[,{,<" /> <Key latin:keyLabel=")" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="]}>" + latin:popupCharacters="],},>" latin:keyEdgeFlags="right" /> </Row> <Row> @@ -114,16 +102,13 @@ latin:keyEdgeFlags="left" /> <Key latin:keyLabel="!" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="¡" /> <Key latin:keyLabel=""" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="“”«»˝" /> + latin:popupCharacters="“,”,«,»,˝" /> <Key latin:keyLabel="\'" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="‘’" /> + latin:popupCharacters="‘,’" /> <Key latin:keyLabel=":" /> <Key @@ -132,7 +117,6 @@ latin:keyLabel="/" /> <Key latin:keyLabel="\?" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="¿" /> <Key latin:keyStyle="deleteKeyStyle" diff --git a/java/res/xml/kbd_symbols_f1.xml b/java/res/xml/kbd_symbols_f1.xml index 07ee4edd3..8487b6158 100644 --- a/java/res/xml/kbd_symbols_f1.xml +++ b/java/res/xml/kbd_symbols_f1.xml @@ -33,8 +33,8 @@ > <Key latin:keyLabel="," - latin:popupKeyboard="@xml/popup_comma" latin:keyHintIcon="@drawable/hint_popup" + latin:popupCharacters="@string/alternates_for_settings_comma" latin:keyStyle="functionalKeyStyle" /> </case> </switch> diff --git a/java/res/xml/kbd_symbols_row4.xml b/java/res/xml/kbd_symbols_row4.xml index 1a5417d08..b330095af 100644 --- a/java/res/xml/kbd_symbols_row4.xml +++ b/java/res/xml/kbd_symbols_row4.xml @@ -40,7 +40,8 @@ <Key latin:keyLabel="." latin:keyHintIcon="@drawable/hint_popup" - latin:popupKeyboard="@xml/popup_punctuation" + latin:popupCharacters="@string/alternates_for_punctuation" + latin:maxPopupKeyboardColumn="7" latin:keyStyle="functionalKeyStyle" /> <switch> <case @@ -76,7 +77,8 @@ <Key latin:keyLabel="." latin:keyHintIcon="@drawable/hint_popup" - latin:popupKeyboard="@xml/popup_punctuation" + latin:popupCharacters="@string/alternates_for_punctuation" + latin:maxPopupKeyboardColumn="7" latin:keyStyle="functionalKeyStyle" /> <switch> <case diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml index ee8d88218..368ee805b 100644 --- a/java/res/xml/kbd_symbols_shift.xml +++ b/java/res/xml/kbd_symbols_shift.xml @@ -26,6 +26,8 @@ latin:keyWidth="10%p" latin:horizontalGap="@dimen/key_horizontal_gap" latin:verticalGap="@dimen/key_bottom_gap" + latin:popupKeyboardTemplate="@xml/kbd_popup_template" + latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column" > <include latin:keyboardLayout="@xml/kbd_key_styles" /> @@ -41,13 +43,11 @@ latin:keyLabel="|" /> <Key latin:keyLabel="•" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="♪♥♠♦♣" /> + latin:popupCharacters="♪,♥,♠,♦,♣" /> <Key latin:keyLabel="√" /> <Key latin:keyLabel="π" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="Π" /> <Key latin:keyLabel="÷" /> @@ -73,14 +73,12 @@ latin:keyLabel="°" /> <Key latin:keyLabel="^" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="↑↓←→" /> + latin:popupCharacters="↑,↓,←,→" /> <Key latin:keyLabel="_" /> <Key latin:keyLabel="=" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="≠≈∞" /> + latin:popupCharacters="≠,≈,∞" /> <Key latin:keyLabel="[" /> <Key @@ -100,18 +98,15 @@ latin:keyLabel="©" /> <Key latin:keyLabel="¶" - latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="§" /> <Key latin:keyLabel="\\" /> <Key latin:keyLabel="<" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="≤«‹" /> + latin:popupCharacters="≤,«,‹" /> <Key latin:keyLabel=">" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="≥»›" /> + latin:popupCharacters="≥,»,›" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="15%p" diff --git a/java/res/xml/popup_at.xml b/java/res/xml/popup_at.xml deleted file mode 100644 index 92ad81616..000000000 --- a/java/res/xml/popup_at.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="10%p" - latin:horizontalGap="0px" - latin:verticalGap="0px" - latin:rowHeight="@dimen/popup_key_height" -> - <Row - latin:rowEdgeFlags="top|bottom" - > - <Key - latin:codes="@integer/key_settings" - latin:keyIcon="@drawable/sym_keyboard_settings" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="\@" - latin:keyEdgeFlags="right" /> - </Row> -</Keyboard> diff --git a/java/res/xml/popup_comma.xml b/java/res/xml/popup_comma.xml deleted file mode 100644 index 9ef49dfda..000000000 --- a/java/res/xml/popup_comma.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="10%p" - latin:horizontalGap="0px" - latin:verticalGap="0px" - latin:rowHeight="@dimen/popup_key_height" -> - <Row - latin:rowEdgeFlags="top|bottom" - > - <Key - latin:codes="@integer/key_settings" - latin:keyIcon="@drawable/sym_keyboard_settings" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="," - latin:keyEdgeFlags="right" /> - </Row> -</Keyboard> diff --git a/java/res/xml/popup_domains.xml b/java/res/xml/popup_domains.xml deleted file mode 100644 index 9fbbdec11..000000000 --- a/java/res/xml/popup_domains.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2008, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="15%p" - latin:horizontalGap="0px" - latin:verticalGap="0px" - latin:rowHeight="@dimen/popup_key_height" -> - <Row - latin:rowEdgeFlags="top|bottom" - > - <Key - latin:keyLabel="@string/popular_domain_1" - latin:keyOutputText="@string/popular_domain_1" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="@string/popular_domain_2" - latin:keyOutputText="@string/popular_domain_2" /> - <Key - latin:keyLabel="@string/popular_domain_3" - latin:keyOutputText="@string/popular_domain_3" /> - <Key - latin:keyLabel="@string/popular_domain_4" - latin:keyOutputText="@string/popular_domain_4" - latin:keyEdgeFlags="right" /> - </Row> -</Keyboard> diff --git a/java/res/xml/popup_mic.xml b/java/res/xml/popup_mic.xml deleted file mode 100644 index 1851eba98..000000000 --- a/java/res/xml/popup_mic.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="10%p" - latin:horizontalGap="0px" - latin:verticalGap="0px" - latin:rowHeight="@dimen/popup_key_height" -> - <Row - latin:rowEdgeFlags="top|bottom" - > - <Key - latin:codes="@integer/key_settings" - latin:keyIcon="@drawable/sym_keyboard_settings" - latin:keyEdgeFlags="left" /> - <Key - latin:codes="@integer/key_voice" - latin:keyIcon="@drawable/sym_keyboard_mic" - latin:keyEdgeFlags="right" /> - </Row> -</Keyboard> diff --git a/java/res/xml/popup_punctuation.xml b/java/res/xml/popup_punctuation.xml deleted file mode 100644 index 6c778c724..000000000 --- a/java/res/xml/popup_punctuation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2008, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="10%p" - latin:horizontalGap="0px" - latin:verticalGap="0px" - latin:rowHeight="@dimen/popup_key_height" -> - <Row - latin:rowEdgeFlags="top" - > - <Key - latin:keyLabel=":" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="/" /> - <Key - latin:keyLabel="&" /> - <Key - latin:keyLabel="(" /> - <Key - latin:keyLabel=")" /> - <Key - latin:keyLabel="-" /> - <Key - latin:keyLabel="+" - latin:keyEdgeFlags="right" /> - </Row> - <Row - latin:rowEdgeFlags="bottom" - > - <Key - latin:keyLabel=";" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="\@" /> - <Key - latin:keyLabel="\'" /> - <Key - latin:keyLabel=""" /> - <Key - latin:keyLabel="\?" /> - <Key - latin:keyLabel="!" /> - <Key - latin:keyLabel="," - latin:keyEdgeFlags="right" /> - </Row> -</Keyboard> diff --git a/java/res/xml/popup_slash.xml b/java/res/xml/popup_slash.xml deleted file mode 100644 index 611500c9e..000000000 --- a/java/res/xml/popup_slash.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="10%p" - latin:horizontalGap="0px" - latin:verticalGap="0px" - latin:rowHeight="@dimen/popup_key_height" -> - <Row - latin:rowEdgeFlags="top|bottom" - > - <Key - latin:codes="@integer/key_settings" - latin:keyIcon="@drawable/sym_keyboard_settings" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="/" - latin:keyEdgeFlags="right" /> - </Row> -</Keyboard> diff --git a/java/res/xml/popup_smileys.xml b/java/res/xml/popup_smileys.xml deleted file mode 100644 index b87667222..000000000 --- a/java/res/xml/popup_smileys.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2008, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<Keyboard - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:keyWidth="15%p" - latin:horizontalGap="0px" - latin:verticalGap="0px" - latin:rowHeight="@dimen/popup_key_height" -> - <Row - latin:rowEdgeFlags="top" - > - <Key - latin:keyLabel=":-)" - latin:keyOutputText=":-) " - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel=":-(" - latin:keyOutputText=":-( " /> - <Key - latin:keyLabel=";-)" - latin:keyOutputText=";-) " /> - <Key - latin:keyLabel=":-P" - latin:keyOutputText=":-P " /> - <Key - latin:keyLabel="=-O" - latin:keyOutputText="=-O " - latin:keyEdgeFlags="right" /> - </Row> - <Row> - <Key - latin:keyLabel=":-*" - latin:keyOutputText=":-* " - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel=":O" - latin:keyOutputText=":O " /> - <Key - latin:keyLabel="B-)" - latin:keyOutputText="B-) " /> - <Key - latin:keyLabel=":-$" - latin:keyOutputText=":-$ " /> - <Key - latin:keyLabel=":-!" - latin:keyOutputText=":-! " - latin:keyEdgeFlags="right" /> - </Row> - <Row - latin:rowEdgeFlags="bottom" - > - <Key - latin:keyLabel=":-[" - latin:keyOutputText=":-[ " - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="O:-)" - latin:keyOutputText="O:-) " /> - <Key - latin:keyLabel=":-\\" - latin:keyOutputText=":-\\ " /> - <Key - latin:keyLabel=":'(" - latin:keyOutputText=":'( " /> - <Key - latin:keyLabel=":-D" - latin:keyOutputText=":-D " - latin:keyEdgeFlags="right" /> - </Row> -</Keyboard> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 47b3b4589..3b20298d2 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -34,7 +34,7 @@ android:key="popup_on" android:title="@string/popup_on_keypress" android:persistent="true" - android:defaultValue="@bool/default_popup_preview" + android:defaultValue="@bool/config_default_popup_preview" /> <CheckBoxPreference |