diff options
Diffstat (limited to 'java/res')
103 files changed, 987 insertions, 910 deletions
diff --git a/java/res/layout/more_suggestions.xml b/java/res/layout/more_suggestions.xml new file mode 100644 index 000000000..d387a1573 --- /dev/null +++ b/java/res/layout/more_suggestions.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2011, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + style="?attr/miniKeyboardPanelStyle" + > + <com.android.inputmethod.latin.MoreSuggestionsView + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + android:id="@+id/more_suggestions_view" + android:layout_alignParentBottom="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + latin:keyLabelSize="@dimen/candidate_text_size" + latin:keyHintLetterRatio="@fraction/more_suggestions_info_ratio" + latin:keyHintLetterColor="@android:color/white" + /> +</LinearLayout> diff --git a/java/res/values-ar/donottranslate-altchars.xml b/java/res/values-ar/donottranslate-more-keys.xml index 6f2a3ff7d..90cc3c85f 100644 --- a/java/res/values-ar/donottranslate-altchars.xml +++ b/java/res/values-ar/donottranslate-more-keys.xml @@ -30,7 +30,7 @@ \u0650: ARABIC KASRA \u064b: ARABIC FATHATAN \u064d: ARABIC KASRATAN --> - <string name="alternates_for_punctuation">"\u060c,\u061b,\u061f,!,:,-,/,\',\",\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d"</string> + <string name="more_keys_for_punctuation">"\u060c,\u061b,\u061f,!,:,-,/,\',\",\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d"</string> <integer name="mini_keyboard_column_for_punctuation">9</integer> <string name="keyhintlabel_for_punctuation">\u064b</string> <string name="keylabel_for_symbols_1">"١"</string> @@ -43,35 +43,35 @@ <string name="keylabel_for_symbols_8">"٨"</string> <string name="keylabel_for_symbols_9">"٩"</string> <string name="keylabel_for_symbols_0">"٠"</string> - <string name="alternates_for_symbols_1">1,¹,½,⅓,¼,⅛</string> - <string name="alternates_for_symbols_2">2,²,⅔</string> - <string name="alternates_for_symbols_3">3,³,¾,⅜</string> - <string name="alternates_for_symbols_4">4,⁴</string> - <string name="alternates_for_symbols_5">5,⅝</string> - <string name="alternates_for_symbols_6">6</string> - <string name="alternates_for_symbols_7">7,⅞</string> - <string name="alternates_for_symbols_8">8</string> - <string name="alternates_for_symbols_9">9</string> - <string name="alternates_for_symbols_0">0,ⁿ,∅</string> + <string name="more_keys_for_symbols_1">1,¹,½,⅓,¼,⅛</string> + <string name="more_keys_for_symbols_2">2,²,⅔</string> + <string name="more_keys_for_symbols_3">3,³,¾,⅜</string> + <string name="more_keys_for_symbols_4">4,⁴</string> + <string name="more_keys_for_symbols_5">5,⅝</string> + <string name="more_keys_for_symbols_6">6</string> + <string name="more_keys_for_symbols_7">7,⅞</string> + <string name="more_keys_for_symbols_8">8</string> + <string name="more_keys_for_symbols_9">9</string> + <string name="more_keys_for_symbols_0">0,ⁿ,∅</string> <string name="keylabel_for_comma">\u060c</string> <string name="keylabel_for_f1">\u060c</string> <string name="keylabel_for_symbols_question">\u061f</string> <string name="keylabel_for_symbols_semicolon">\u061b</string> <!-- \u066a: ARABIC PERCENT SIGN --> <string name="keylabel_for_symbols_percent">\u066a</string> - <string name="alternates_for_comma">,</string> - <string name="alternates_for_f1">,</string> + <string name="more_keys_for_comma">,</string> + <string name="more_keys_for_f1">,</string> <!-- @icon/3 is iconSettingsKey --> - <string name="alternates_for_f1_settings">\\,,\@icon/3|\@integer/key_settings</string> + <string name="more_keys_for_f1_settings">\\,,\@icon/3|\@integer/key_settings</string> <!-- @icon/7 is iconTabKey --> - <string name="alternates_for_f1_navigate">\\,,\@icon/7|\@integer/key_tab</string> - <string name="alternates_for_symbols_question">\?,¿</string> - <string name="alternates_for_symbols_semicolon">;</string> - <string name="alternates_for_symbols_percent">%,‰</string> + <string name="more_keys_for_f1_navigate">\\,,\@icon/7|\@integer/key_tab</string> + <string name="more_keys_for_symbols_question">\?,¿</string> + <string name="more_keys_for_symbols_semicolon">;</string> + <string name="more_keys_for_symbols_percent">%,‰</string> <string name="keylabel_for_apostrophe">"،"</string> <string name="keylabel_for_dash">"."</string> <string name="keyhintlabel_for_apostrophe">"؟"</string> <string name="keyhintlabel_for_dash">"\u064b"</string> - <string name="alternates_for_apostrophe">"\u061f,\u061b,!,:,-,/,\',\""</string> - <string name="alternates_for_dash">"\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d"</string> + <string name="more_keys_for_apostrophe">"\u061f,\u061b,!,:,-,/,\',\""</string> + <string name="more_keys_for_dash">"\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d"</string> </resources> diff --git a/java/res/values-ca/donottranslate-altchars.xml b/java/res/values-ca/donottranslate-more-keys.xml index 336057be0..bd9fb7ccd 100644 --- a/java/res/values-ca/donottranslate-altchars.xml +++ b/java/res/values-ca/donottranslate-more-keys.xml @@ -18,12 +18,12 @@ */ --> <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_n">ñ,ń</string> - <string name="alternates_for_c">ç,ć,č</string> - <string name="alternates_for_l">ŀ,ł</string> + <string name="more_keys_for_a">à,á,ä,â,ã,å,ą,æ,ā,ª</string> + <string name="more_keys_for_e">3,è,é,ë,ê,ę,ė,ē</string> + <string name="more_keys_for_i">8,í,ï,ì,î,į,ī</string> + <string name="more_keys_for_o">9,ò,ó,ö,ô,õ,ø,œ,ō,º</string> + <string name="more_keys_for_u">7,ú,ü,ù,û,ū</string> + <string name="more_keys_for_n">ñ,ń</string> + <string name="more_keys_for_c">ç,ć,č</string> + <string name="more_keys_for_l">ŀ,ł</string> </resources> diff --git a/java/res/values-cs/donottranslate-altchars.xml b/java/res/values-cs/donottranslate-altchars.xml deleted file mode 100644 index 541cd2154..000000000 --- a/java/res/values-cs/donottranslate-altchars.xml +++ /dev/null @@ -1,34 +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">ý,ÿ</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">6,ž,ź,ż</string> -</resources> diff --git a/java/res/values-fr/donottranslate-altchars.xml b/java/res/values-cs/donottranslate-more-keys.xml index ae9292f91..70b3f3ee7 100644 --- a/java/res/values-fr/donottranslate-altchars.xml +++ b/java/res/values-cs/donottranslate-more-keys.xml @@ -18,14 +18,17 @@ */ --> <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_c">ç,ć,č</string> - <string name="alternates_for_y">6,ÿ</string> - <string name="alternates_for_q"></string> - <string name="alternates_for_w"></string> - <string name="alternates_for_z">2</string> + <string name="more_keys_for_a">á,à,â,ä,æ,ã,å,ā</string> + <string name="more_keys_for_e">3,é,ě,è,ê,ë,ę,ė,ē</string> + <string name="more_keys_for_i">8,í,î,ï,ì,į,ī</string> + <string name="more_keys_for_o">9,ó,ö,ô,ò,õ,œ,ø,ō</string> + <string name="more_keys_for_u">7,ú,ů,û,ü,ù,ū</string> + <string name="more_keys_for_s">š,ß,ś</string> + <string name="more_keys_for_n">ň,ñ,ń</string> + <string name="more_keys_for_c">č,ç,ć</string> + <string name="more_keys_for_y">ý,ÿ</string> + <string name="more_keys_for_d">ď</string> + <string name="more_keys_for_r">4,ř</string> + <string name="more_keys_for_t">5,ť</string> + <string name="more_keys_for_z">6,ž,ź,ż</string> </resources> diff --git a/java/res/values-da/donottranslate-altchars.xml b/java/res/values-da/donottranslate-more-keys.xml index 46f1644ad..12c1ebfe1 100644 --- a/java/res/values-da/donottranslate-altchars.xml +++ b/java/res/values-da/donottranslate-more-keys.xml @@ -18,18 +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_y">6,ý,ÿ</string> - <string name="alternates_for_d">ð</string> - <string name="alternates_for_l">ł</string> + <string name="more_keys_for_a">á,ä,à,â,ã,ā</string> + <string name="more_keys_for_e">3,é,ë</string> + <string name="more_keys_for_i">8,í,ï</string> + <string name="more_keys_for_o">9,ó,ô,ò,õ,œ,ō</string> + <string name="more_keys_for_u">7,ú,ü,û,ù,ū</string> + <string name="more_keys_for_s">ß,ś,š</string> + <string name="more_keys_for_n">ñ,ń</string> + <string name="more_keys_for_y">6,ý,ÿ</string> + <string name="more_keys_for_d">ð</string> + <string name="more_keys_for_l">ł</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="more_keys_for_scandinavia_row2_10">ä</string> + <string name="more_keys_for_scandinavia_row2_11">ö</string> </resources> diff --git a/java/res/values-de-rZZ/donottranslate-altchars.xml b/java/res/values-de-rZZ/donottranslate-altchars.xml deleted file mode 100644 index a6f8fc810..000000000 --- a/java/res/values-de-rZZ/donottranslate-altchars.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2011, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<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_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_y">6</string> - <string name="alternates_for_z"></string> -</resources> diff --git a/java/res/values-hu/donottranslate-altchars.xml b/java/res/values-de-rZZ/donottranslate-more-keys.xml index ae28cc5b8..06e76b03c 100644 --- a/java/res/values-hu/donottranslate-altchars.xml +++ b/java/res/values-de-rZZ/donottranslate-more-keys.xml @@ -18,11 +18,12 @@ */ --> <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"></string> - <string name="alternates_for_z">6</string> + <string name="more_keys_for_a">ä,â,à,á,æ,ã,å,ā</string> + <string name="more_keys_for_e">3,ė</string> + <string name="more_keys_for_o">9,ö,ô,ò,ó,õ,œ,ø,ō</string> + <string name="more_keys_for_u">7,ü,û,ù,ú,ū</string> + <string name="more_keys_for_s">ß,ś,š</string> + <string name="more_keys_for_n">ñ,ń</string> + <string name="more_keys_for_y">6</string> + <string name="more_keys_for_z"></string> </resources> diff --git a/java/res/values-de/donottranslate-more-keys.xml b/java/res/values-de/donottranslate-more-keys.xml new file mode 100644 index 000000000..80aa32ae2 --- /dev/null +++ b/java/res/values-de/donottranslate-more-keys.xml @@ -0,0 +1,29 @@ +<?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="more_keys_for_a">ä,â,à,á,æ,ã,å,ā</string> + <string name="more_keys_for_e">3,ė</string> + <string name="more_keys_for_o">9,ö,ô,ò,ó,õ,œ,ø,ō</string> + <string name="more_keys_for_u">7,ü,û,ù,ú,ū</string> + <string name="more_keys_for_s">ß,ś,š</string> + <string name="more_keys_for_n">ñ,ń</string> + <string name="more_keys_for_y"></string> + <string name="more_keys_for_z">6</string> +</resources> diff --git a/java/res/values-en/donottranslate-more-keys.xml b/java/res/values-en/donottranslate-more-keys.xml new file mode 100644 index 000000000..bc26c6aa0 --- /dev/null +++ b/java/res/values-en/donottranslate-more-keys.xml @@ -0,0 +1,29 @@ +<?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="more_keys_for_a">à,á,â,ä,æ,ã,å,ā</string> + <string name="more_keys_for_e">3,è,é,ê,ë,ē</string> + <string name="more_keys_for_i">8,î,ï,í,ī,ì</string> + <string name="more_keys_for_o">9,ô,ö,ò,ó,œ,ø,ō,õ</string> + <string name="more_keys_for_s">ß</string> + <string name="more_keys_for_u">7,û,ü,ù,ú,ū</string> + <string name="more_keys_for_n">ñ</string> + <string name="more_keys_for_c">ç</string> +</resources> diff --git a/java/res/values-es/donottranslate-altchars.xml b/java/res/values-es/donottranslate-more-keys.xml index e1f849f62..d5a8ed19d 100644 --- a/java/res/values-es/donottranslate-altchars.xml +++ b/java/res/values-es/donottranslate-more-keys.xml @@ -18,12 +18,12 @@ */ --> <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_n">ñ,ń</string> - <string name="alternates_for_c">ç,ć,č</string> - <string name="alternates_for_punctuation">"\\,,\?,!,¿,¡,:,-,\',\",),(,/,;,+,&,\@"</string> + <string name="more_keys_for_a">á,à,ä,â,ã,å,ą,æ,ā,ª</string> + <string name="more_keys_for_e">3,é,è,ë,ê,ę,ė,ē</string> + <string name="more_keys_for_i">8,í,ï,ì,î,į,ī</string> + <string name="more_keys_for_o">9,ó,ò,ö,ô,õ,ø,œ,ō,º</string> + <string name="more_keys_for_u">7,ú,ü,ù,û,ū</string> + <string name="more_keys_for_n">ñ,ń</string> + <string name="more_keys_for_c">ç,ć,č</string> + <string name="more_keys_for_punctuation">"\\,,\?,!,¿,¡,:,-,\',\",),(,/,;,+,&,\@"</string> </resources> diff --git a/java/res/values-fi/donottranslate-altchars.xml b/java/res/values-fi/donottranslate-more-keys.xml index ff87a3258..df67c69ba 100644 --- a/java/res/values-fi/donottranslate-altchars.xml +++ b/java/res/values-fi/donottranslate-more-keys.xml @@ -18,13 +18,13 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">æ,à,á,â,ã,ā</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_z">ž,ź,ż</string> + <string name="more_keys_for_a">æ,à,á,â,ã,ā</string> + <string name="more_keys_for_o">9,ø,ô,ò,ó,õ,œ,ō</string> + <string name="more_keys_for_u">7,ü</string> + <string name="more_keys_for_s">š,ß,ś</string> + <string name="more_keys_for_z">ž,ź,ż</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="more_keys_for_scandinavia_row2_10">ø</string> + <string name="more_keys_for_scandinavia_row2_11">æ</string> </resources> diff --git a/java/res/values-en/donottranslate-altchars.xml b/java/res/values-fr/donottranslate-more-keys.xml index 29582c950..cd6d49bad 100644 --- a/java/res/values-en/donottranslate-altchars.xml +++ b/java/res/values-fr/donottranslate-more-keys.xml @@ -18,12 +18,14 @@ */ --> <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_s">ß</string> - <string name="alternates_for_u">7,û,ü,ù,ú,ū</string> - <string name="alternates_for_n">ñ</string> - <string name="alternates_for_c">ç</string> + <string name="more_keys_for_a">à,â,1,æ,á,ä,ã,å,ā,ª</string> + <string name="more_keys_for_e">é,è,ê,ë,3,ę,ė,ē</string> + <string name="more_keys_for_i">î,8,ï,ì,í,į,ī</string> + <string name="more_keys_for_o">ô,œ,9,ö,ò,ó,õ,ø,ō,º</string> + <string name="more_keys_for_u">ù,û,7,ü,ú,ū</string> + <string name="more_keys_for_c">ç,ć,č</string> + <string name="more_keys_for_y">6,ÿ</string> + <string name="more_keys_for_q"></string> + <string name="more_keys_for_w"></string> + <string name="more_keys_for_z">2</string> </resources> diff --git a/java/res/values-hr/donottranslate-altchars.xml b/java/res/values-hr/donottranslate-more-keys.xml index d0c9d4049..c34e0e646 100644 --- a/java/res/values-hr/donottranslate-altchars.xml +++ b/java/res/values-hr/donottranslate-more-keys.xml @@ -18,10 +18,10 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_s">š,ś,ß</string> - <string name="alternates_for_n">ñ,ń</string> - <string name="alternates_for_y"></string> - <string name="alternates_for_z">6,ž,ź,ż</string> - <string name="alternates_for_c">č,ć,ç</string> - <string name="alternates_for_d">đ</string> + <string name="more_keys_for_s">š,ś,ß</string> + <string name="more_keys_for_n">ñ,ń</string> + <string name="more_keys_for_y"></string> + <string name="more_keys_for_z">6,ž,ź,ż</string> + <string name="more_keys_for_c">č,ć,ç</string> + <string name="more_keys_for_d">đ</string> </resources> diff --git a/java/res/values-lt/donottranslate-altchars.xml b/java/res/values-hu/donottranslate-more-keys.xml index 4aba93a3a..42b330199 100644 --- a/java/res/values-lt/donottranslate-altchars.xml +++ b/java/res/values-hu/donottranslate-more-keys.xml @@ -18,11 +18,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_u">7,ų,ū,û,ü,ù,ú</string> - <string name="alternates_for_s">š,ß,ś</string> - <string name="alternates_for_c">č,ç,ć</string> - <string name="alternates_for_z">ž,ź,ż</string> + <string name="more_keys_for_a">á,à,â,ä,æ,ã,å,ā</string> + <string name="more_keys_for_e">3,é,è,ê,ë,ę,ė,ē</string> + <string name="more_keys_for_i">8,í,î,ï,ì,į,ī</string> + <string name="more_keys_for_o">9,ó,ö,ő,ô,ò,õ,œ,ø,ō</string> + <string name="more_keys_for_u">7,ú,ü,ű,û,ù,ū</string> + <string name="more_keys_for_y"></string> + <string name="more_keys_for_z">6</string> </resources> diff --git a/java/res/values-it/donottranslate-altchars.xml b/java/res/values-it/donottranslate-more-keys.xml index 1131d4852..fa1537bec 100644 --- a/java/res/values-it/donottranslate-altchars.xml +++ b/java/res/values-it/donottranslate-more-keys.xml @@ -18,9 +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="more_keys_for_a">à,á,â,ä,æ,ã,å,ā,ª</string> + <string name="more_keys_for_e">3,è,é,ê,ë,ę,ė,ē</string> + <string name="more_keys_for_i">8,ì,í,î,ï,į,ī</string> + <string name="more_keys_for_o">9,ò,ó,ô,ö,õ,œ,ø,ō,º</string> + <string name="more_keys_for_u">7,ù,ú,û,ü,ū</string> </resources> diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml index 73e1aff96..4bf0e2092 100644 --- a/java/res/values-land/dimens.xml +++ b/java/res/values-land/dimens.xml @@ -59,6 +59,8 @@ <dimen name="key_preview_offset_ics">0.01in</dimen> <dimen name="candidate_strip_height">36dip</dimen> + <dimen name="more_suggestions_row_height">36dip</dimen> + <dimen name="candidate_strip_minimum_height">160sp</dimen> <dimen name="candidate_strip_fading_edge_length">63dip</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> diff --git a/java/res/values-lt/donottranslate-more-keys.xml b/java/res/values-lt/donottranslate-more-keys.xml new file mode 100644 index 000000000..6b81e4509 --- /dev/null +++ b/java/res/values-lt/donottranslate-more-keys.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2011, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="more_keys_for_a">ą,à,á,â,ä,æ,ã,å,ā</string> + <string name="more_keys_for_e">3,ė,ę,è,é,ê,ë,ē</string> + <string name="more_keys_for_i">8,į,î,ï,ì,í,ī</string> + <string name="more_keys_for_u">7,ų,ū,û,ü,ù,ú</string> + <string name="more_keys_for_s">š,ß,ś</string> + <string name="more_keys_for_c">č,ç,ć</string> + <string name="more_keys_for_z">ž,ź,ż</string> +</resources> diff --git a/java/res/values-lv/donottranslate-altchars.xml b/java/res/values-lv/donottranslate-altchars.xml deleted file mode 100644 index 05d9bc894..000000000 --- a/java/res/values-lv/donottranslate-altchars.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2011, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<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_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_r">4,ŗ</string> - <string name="alternates_for_z">ž,ź,ż</string> - <string name="alternates_for_k">ķ</string> - <string name="alternates_for_l">ļ,ł</string> - <string name="alternates_for_g">ģ</string> -</resources> diff --git a/java/res/values-lv/donottranslate-more-keys.xml b/java/res/values-lv/donottranslate-more-keys.xml new file mode 100644 index 000000000..77e1c26a0 --- /dev/null +++ b/java/res/values-lv/donottranslate-more-keys.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2011, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="more_keys_for_a">ā,à,á,â,ä,æ,ã,å</string> + <string name="more_keys_for_e">3,ē,è,é,ê,ë,ę,ė</string> + <string name="more_keys_for_i">8,ī,î,ï,ì,í,į</string> + <string name="more_keys_for_u">7,ū,û,ü,ù,ú</string> + <string name="more_keys_for_s">š,ß,ś</string> + <string name="more_keys_for_n">ņ,ñ,ń</string> + <string name="more_keys_for_c">č,ç,ć</string> + <string name="more_keys_for_r">4,ŗ</string> + <string name="more_keys_for_z">ž,ź,ż</string> + <string name="more_keys_for_k">ķ</string> + <string name="more_keys_for_l">ļ,ł</string> + <string name="more_keys_for_g">ģ</string> +</resources> diff --git a/java/res/values-nb/donottranslate-altchars.xml b/java/res/values-nb/donottranslate-more-keys.xml index 798e51c9a..b98341c6a 100644 --- a/java/res/values-nb/donottranslate-altchars.xml +++ b/java/res/values-nb/donottranslate-more-keys.xml @@ -18,12 +18,12 @@ */ --> <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_o">9,ô,ò,ó,ö,õ,œ,ō</string> - <string name="alternates_for_u">7,ü,û,ù,ú,ū</string> + <string name="more_keys_for_a">à,ä,á,â,ã,ā</string> + <string name="more_keys_for_e">3,é,è,ê,ë,ę,ė,ē</string> + <string name="more_keys_for_o">9,ô,ò,ó,ö,õ,œ,ō</string> + <string name="more_keys_for_u">7,ü,û,ù,ú,ū</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="more_keys_for_scandinavia_row2_10">ö</string> + <string name="more_keys_for_scandinavia_row2_11">ä</string> </resources> diff --git a/java/res/values-nl/donottranslate-altchars.xml b/java/res/values-nl/donottranslate-more-keys.xml index e26a74967..49cc41964 100644 --- a/java/res/values-nl/donottranslate-altchars.xml +++ b/java/res/values-nl/donottranslate-more-keys.xml @@ -18,10 +18,10 @@ */ --> <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_n">ñ,ń</string> + <string name="more_keys_for_a">á,ä,â,à,æ,ã,å,ā</string> + <string name="more_keys_for_e">3,é,ë,ê,è,ę,ė,ē</string> + <string name="more_keys_for_i">8,í,ï,ì,î,į,ī</string> + <string name="more_keys_for_o">9,ó,ö,ô,ò,õ,œ,ø,ō</string> + <string name="more_keys_for_u">7,ú,ü,û,ù,ū</string> + <string name="more_keys_for_n">ñ,ń</string> </resources> diff --git a/java/res/values-pl/donottranslate-altchars.xml b/java/res/values-pl/donottranslate-altchars.xml deleted file mode 100644 index 971d73bc5..000000000 --- a/java/res/values-pl/donottranslate-altchars.xml +++ /dev/null @@ -1,29 +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_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_z">ż,ź,ž</string> - <string name="alternates_for_l">ł</string> -</resources> diff --git a/java/res/values-de/donottranslate-altchars.xml b/java/res/values-pl/donottranslate-more-keys.xml index 8b8b6aed7..18e149991 100644 --- a/java/res/values-de/donottranslate-altchars.xml +++ b/java/res/values-pl/donottranslate-more-keys.xml @@ -18,12 +18,12 @@ */ --> <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_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_y"></string> - <string name="alternates_for_z">6</string> + <string name="more_keys_for_a">ą,á,à,â,ä,æ,ã,å,ā</string> + <string name="more_keys_for_e">3,ę,è,é,ê,ë,ė,ē</string> + <string name="more_keys_for_o">9,ó,ö,ô,ò,õ,œ,ø,ō</string> + <string name="more_keys_for_s">ś,ß,š</string> + <string name="more_keys_for_n">ń,ñ</string> + <string name="more_keys_for_c">ć,ç,č</string> + <string name="more_keys_for_z">ż,ź,ž</string> + <string name="more_keys_for_l">ł</string> </resources> diff --git a/java/res/values-pt/donottranslate-altchars.xml b/java/res/values-pt/donottranslate-more-keys.xml index a39976151..31d9417ab 100644 --- a/java/res/values-pt/donottranslate-altchars.xml +++ b/java/res/values-pt/donottranslate-more-keys.xml @@ -18,10 +18,10 @@ */ --> <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_c">ç,č,ć</string> + <string name="more_keys_for_a">á,ã,à,â,ä,å,æ,ª</string> + <string name="more_keys_for_e">3,é,ê,è,ę,ė,ē,ë</string> + <string name="more_keys_for_i">8,í,î,ì,ï,į,ī</string> + <string name="more_keys_for_o">9,ó,õ,ô,ò,ö,œ,ø,ō,º</string> + <string name="more_keys_for_u">7,ú,ü,ù,û,ū</string> + <string name="more_keys_for_c">ç,č,ć</string> </resources> diff --git a/java/res/values-rm/donottranslate-altchars.xml b/java/res/values-rm/donottranslate-more-keys.xml index 0a5d2aad1..ea9a55944 100644 --- a/java/res/values-rm/donottranslate-altchars.xml +++ b/java/res/values-rm/donottranslate-more-keys.xml @@ -18,5 +18,5 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_o">9,ò,ó,ö,ô,õ,œ,ø</string> + <string name="more_keys_for_o">9,ò,ó,ö,ô,õ,œ,ø</string> </resources> diff --git a/java/res/values-ro/donottranslate-altchars.xml b/java/res/values-ro/donottranslate-more-keys.xml index 728ead472..d7e6a171d 100644 --- a/java/res/values-ro/donottranslate-altchars.xml +++ b/java/res/values-ro/donottranslate-more-keys.xml @@ -18,8 +18,8 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">ă,â,à,á,ä,æ,ã,å,ā</string> - <string name="alternates_for_i">8,î,ï,ì,í,į,ī</string> - <string name="alternates_for_s">ș,ß,ś,š</string> - <string name="alternates_for_t">5,ț</string> + <string name="more_keys_for_a">ă,â,à,á,ä,æ,ã,å,ā</string> + <string name="more_keys_for_i">8,î,ï,ì,í,į,ī</string> + <string name="more_keys_for_s">ș,ß,ś,š</string> + <string name="more_keys_for_t">5,ț</string> </resources> diff --git a/java/res/values-ru/donottranslate-altchars.xml b/java/res/values-ru/donottranslate-more-keys.xml index 2a24e563e..f7e006e84 100644 --- a/java/res/values-ru/donottranslate-altchars.xml +++ b/java/res/values-ru/donottranslate-more-keys.xml @@ -18,7 +18,7 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_cyrillic_e">5,ё</string> - <string name="alternates_for_cyrillic_soft_sign">ъ</string> - <string name="alternates_for_cyrillic_ha">ъ</string> + <string name="more_keys_for_cyrillic_e">5,ё</string> + <string name="more_keys_for_cyrillic_soft_sign">ъ</string> + <string name="more_keys_for_cyrillic_ha">ъ</string> </resources> diff --git a/java/res/values-sk/donottranslate-altchars.xml b/java/res/values-sk/donottranslate-altchars.xml deleted file mode 100644 index 6d9836e9c..000000000 --- a/java/res/values-sk/donottranslate-altchars.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2011, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<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_l">ľ,ĺ,ł</string> -</resources> diff --git a/java/res/values-sk/donottranslate-more-keys.xml b/java/res/values-sk/donottranslate-more-keys.xml new file mode 100644 index 000000000..b73db0a46 --- /dev/null +++ b/java/res/values-sk/donottranslate-more-keys.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2011, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="more_keys_for_a">ä,á,à,â,æ,ã,å,ā</string> + <string name="more_keys_for_e">3,é,ě,è,ê,ë,ę,ė,ē</string> + <string name="more_keys_for_i">8,í,î,ï,ì,į,ī</string> + <string name="more_keys_for_o">9,ô,ó,ö,ò,õ,œ,ø,ō</string> + <string name="more_keys_for_u">7,ú,ú,û,ü,ù,ū</string> + <string name="more_keys_for_s">š,ß,ś</string> + <string name="more_keys_for_n">ň,ñ,ń</string> + <string name="more_keys_for_c">č,ç,ć</string> + <string name="more_keys_for_y">6,ý,ÿ</string> + <string name="more_keys_for_d">ď</string> + <string name="more_keys_for_r">4,ŕ,ř</string> + <string name="more_keys_for_t">5,ť</string> + <string name="more_keys_for_z">ž,ź,ż</string> + <string name="more_keys_for_l">ľ,ĺ,ł</string> +</resources> diff --git a/java/res/values-sv/donottranslate-altchars.xml b/java/res/values-sv/donottranslate-more-keys.xml index d03ae1a6c..1fa29a83e 100644 --- a/java/res/values-sv/donottranslate-altchars.xml +++ b/java/res/values-sv/donottranslate-more-keys.xml @@ -18,12 +18,12 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_e">3,é,è,ê,ë,ę</string> - <string name="alternates_for_o">9,œ,ô,ò,ó,õ,ō</string> - <string name="alternates_for_u">7,ü,û,ù,ú,ū</string> - <string name="alternates_for_s">ß,ś,š</string> + <string name="more_keys_for_e">3,é,è,ê,ë,ę</string> + <string name="more_keys_for_o">9,œ,ô,ò,ó,õ,ō</string> + <string name="more_keys_for_u">7,ü,û,ù,ú,ū</string> + <string name="more_keys_for_s">ß,ś,š</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="more_keys_for_scandinavia_row2_10">ø</string> + <string name="more_keys_for_scandinavia_row2_11">æ</string> </resources> diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml index 17aeff7cc..1854a8696 100644 --- a/java/res/values-sw600dp/config.xml +++ b/java/res/values-sw600dp/config.xml @@ -25,7 +25,7 @@ <bool name="config_enable_show_popup_on_keypress_option">false</bool> <bool name="config_enable_bigram_suggestions_option">false</bool> <bool name="config_sliding_key_input_enabled">false</bool> - <bool name="config_digit_popup_characters_enabled">false</bool> + <bool name="config_digit_more_keys_enabled">false</bool> <!-- Whether or not Popup on key press is enabled by default --> <bool name="config_default_popup_preview">false</bool> <bool name="config_default_sound_enabled">true</bool> @@ -39,5 +39,5 @@ <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. --> <string name="config_default_keyboard_theme_id" translatable="false">5</string> <string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string> - <integer name="config_max_mini_keyboard_column">5</integer> + <integer name="config_max_more_keys_column">5</integer> </resources> diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index 942bc726f..6ce23cc70 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -67,6 +67,7 @@ <dimen name="key_preview_offset_ics">0.05in</dimen> <dimen name="candidate_strip_height">44dip</dimen> + <dimen name="more_suggestions_row_height">44dip</dimen> <dimen name="candidate_strip_padding">15.0mm</dimen> <dimen name="candidate_min_width">0.3in</dimen> <dimen name="candidate_padding">12dip</dimen> diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml index 8b4ff367e..a438fe964 100644 --- a/java/res/values-sw768dp/config.xml +++ b/java/res/values-sw768dp/config.xml @@ -25,7 +25,7 @@ <bool name="config_enable_show_popup_on_keypress_option">false</bool> <bool name="config_enable_bigram_suggestions_option">false</bool> <bool name="config_sliding_key_input_enabled">false</bool> - <bool name="config_digit_popup_characters_enabled">false</bool> + <bool name="config_digit_more_keys_enabled">false</bool> <!-- Whether or not Popup on key press is enabled by default --> <bool name="config_default_popup_preview">false</bool> <bool name="config_default_sound_enabled">true</bool> @@ -37,7 +37,7 @@ <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. --> <string name="config_default_keyboard_theme_id" translatable="false">5</string> <string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string> - <integer name="config_max_mini_keyboard_column">5</integer> + <integer name="config_max_more_keys_column">5</integer> <!-- Screen metrics for logging. 0 = "mdpi", 1 = "hdpi", 2 = "xlarge" --> <integer name="log_screen_metrics">2</integer> </resources> diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml index f0340bc70..9b307e6f3 100644 --- a/java/res/values-sw768dp/dimens.xml +++ b/java/res/values-sw768dp/dimens.xml @@ -70,9 +70,8 @@ <dimen name="key_preview_offset_ics">0.05in</dimen> <dimen name="candidate_strip_height">44dip</dimen> - <!-- candidate_strip_minimum_height = - key_preview_height_holo - key_preview_offset_holo + alpha --> - <dimen name="candidate_strip_minimum_height">18mm</dimen> + <dimen name="more_suggestions_row_height">44dip</dimen> + <dimen name="candidate_strip_minimum_height">200sp</dimen> <dimen name="candidate_strip_padding">15.0mm</dimen> <dimen name="candidate_min_width">46dip</dimen> <dimen name="candidate_padding">8dip</dimen> diff --git a/java/res/values-tr/donottranslate-altchars.xml b/java/res/values-tr/donottranslate-more-keys.xml index 1b83b65c8..6906b3580 100644 --- a/java/res/values-tr/donottranslate-altchars.xml +++ b/java/res/values-tr/donottranslate-more-keys.xml @@ -18,11 +18,11 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="alternates_for_a">â</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_g">ğ</string> - <string name="alternates_for_c">ç,ć,č</string> + <string name="more_keys_for_a">â</string> + <string name="more_keys_for_i">8,ı,î,ï,ì,í,į,ī</string> + <string name="more_keys_for_o">9,ö,ô,œ,ò,ó,õ,ø,ō</string> + <string name="more_keys_for_u">7,ü,û,ù,ú,ū</string> + <string name="more_keys_for_s">ş,ß,ś,š</string> + <string name="more_keys_for_g">ğ</string> + <string name="more_keys_for_c">ç,ć,č</string> </resources> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 734004f5a..9d3426842 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -27,6 +27,7 @@ <attr name="miniKeyboardPanelStyle" format="reference" /> <!-- Suggestions strip style --> <attr name="suggestionsStripBackgroundStyle" format="reference" /> + <attr name="suggestionsPaneViewStyle" format="reference" /> <attr name="suggestionBackgroundStyle" format="reference" /> <attr name="suggestionPreviewBackgroundStyle" format="reference" /> <attr name="candidateViewStyle" format="reference" /> @@ -95,8 +96,8 @@ <!-- Amount to offset the touch Y coordinate by, for bias correction. --> <attr name="verticalCorrection" format="dimension" /> - <!-- Layout resource for popup panel --> - <attr name="popupLayout" format="reference" /> + <!-- Layout resource for more keys panel --> + <attr name="moreKeysLayout" format="reference" /> <attr name="shadowColor" format="color" /> <attr name="shadowRadius" format="float" /> @@ -153,8 +154,8 @@ <attr name="horizontalGap" format="dimension|fraction" /> <!-- Default vertical gap between rows of keys. --> <attr name="verticalGap" format="dimension|fraction" /> - <!-- Popup panel layout template --> - <attr name="popupTemplate" format="reference" /> + <!-- More keys keyboard layout template --> + <attr name="moreKeysTemplate" format="reference" /> <!-- Locale of the keyboard layout --> <attr name="keyboardLocale" format="string" /> <!-- True if the keyboard is Right-To-Left --> @@ -178,10 +179,10 @@ <declare-styleable name="Keyboard_Key"> <!-- The unicode value that this key outputs. --> <attr name="code" format="integer" /> - <!-- The characters to display in the popup keyboard. --> - <attr name="popupCharacters" format="string" /> - <!-- Maximum column of mini keyboard --> - <attr name="maxMiniKeyboardColumn" format="integer" /> + <!-- The keys to display in the more keys keyboard. --> + <attr name="moreKeys" format="string" /> + <!-- Maximum column of more keys keyboard --> + <attr name="maxMoreKeysColumn" format="integer" /> <!-- Whether this is a functional key which has different key top than normal key. --> <attr name="isFunctional" format="boolean" /> <!-- Whether this is a toggle key. --> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 28cbc9549..923e37d85 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -27,7 +27,7 @@ <bool name="config_enable_bigram_suggestions_option">true</bool> <bool name="config_enable_usability_study_mode_option">false</bool> <bool name="config_sliding_key_input_enabled">true</bool> - <bool name="config_digit_popup_characters_enabled">true</bool> + <bool name="config_digit_more_keys_enabled">true</bool> <!-- Whether or not Popup on key press is enabled by default --> <bool name="config_default_popup_preview">true</bool> <!-- Default value for bigram suggestion: while showing candidates for a word should we weigh @@ -67,7 +67,7 @@ <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. --> <string name="config_default_keyboard_theme_id" translatable="false">5</string> <string name="config_text_size_of_language_on_spacebar" translatable="false">small</string> - <integer name="config_max_mini_keyboard_column">5</integer> + <integer name="config_max_more_keys_column">5</integer> <string-array name="auto_correction_threshold_values" translatable="false"> <!-- Off, When auto correction setting is Off, this value is not used. --> <item></item> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index 2c4b35ef8..b7609a4ac 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -77,9 +77,11 @@ <dimen name="key_preview_offset_ics">0.05in</dimen> <dimen name="candidate_strip_height">40dip</dimen> - <!-- candidate_strip_minimum_height = - key_preview_height_holo - key_preview_offset_holo + alpha --> - <dimen name="candidate_strip_minimum_height">100sp</dimen> + <dimen name="more_suggestions_key_horizontal_padding">12dip</dimen> + <dimen name="more_suggestions_row_height">40dip</dimen> + <dimen name="more_suggestions_slide_allowance">0.2in</dimen> + <fraction name="more_suggestions_info_ratio">12%</fraction> + <dimen name="candidate_strip_minimum_height">200sp</dimen> <dimen name="candidate_strip_fading_edge_length">63dip</dimen> <dimen name="candidate_strip_padding">0dip</dimen> <dimen name="candidate_min_width">44dip</dimen> diff --git a/java/res/values/donottranslate-altchars.xml b/java/res/values/donottranslate-altchars.xml deleted file mode 100644 index acbf7dfae..000000000 --- a/java/res/values/donottranslate-altchars.xml +++ /dev/null @@ -1,99 +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> - <string name="alternates_for_q">1</string> - <string name="alternates_for_w">2</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_k"></string> - <string name="alternates_for_l"></string> - <string name="alternates_for_g"></string> - <string name="alternates_for_p">0</string> - <string name="alternates_for_v"></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_cyrillic_e"></string> - <string name="alternates_for_cyrillic_soft_sign"></string> - <string name="alternates_for_cyrillic_ha"></string> - <string name="alternates_for_currency_dollar">¢,£,€,¥,₱</string> - <string name="alternates_for_currency_euro">¢,£,$,¥,₱</string> - <string name="alternates_for_currency_pound">¢,$,€,¥,₱</string> - <string name="alternates_for_currency_general">¢,$,€,£,¥,₱</string> - <string name="alternates_for_smiley">":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\\\\\|:-\\\\\\\\ ,:\'(|:\'( ,:-D|:-D "</string> - <string name="alternates_for_punctuation">"\\,,\?,!,:,-,\',\",(,),/,;,+,&,\@"</string> - <integer name="mini_keyboard_column_for_punctuation">7</integer> - <string name="keyhintlabel_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="alternates_for_popular_domain">".net,.org,.gov,.edu"</string> - <string name="keylabel_for_symbols_1">1</string> - <string name="keylabel_for_symbols_2">2</string> - <string name="keylabel_for_symbols_3">3</string> - <string name="keylabel_for_symbols_4">4</string> - <string name="keylabel_for_symbols_5">5</string> - <string name="keylabel_for_symbols_6">6</string> - <string name="keylabel_for_symbols_7">7</string> - <string name="keylabel_for_symbols_8">8</string> - <string name="keylabel_for_symbols_9">9</string> - <string name="keylabel_for_symbols_0">0</string> - <string name="alternates_for_symbols_1">¹,½,⅓,¼,⅛</string> - <string name="alternates_for_symbols_2">²,⅔</string> - <string name="alternates_for_symbols_3">³,¾,⅜</string> - <string name="alternates_for_symbols_4">⁴</string> - <string name="alternates_for_symbols_5">⅝</string> - <string name="alternates_for_symbols_6"></string> - <string name="alternates_for_symbols_7">⅞</string> - <string name="alternates_for_symbols_8"></string> - <string name="alternates_for_symbols_9"></string> - <string name="alternates_for_symbols_0">ⁿ,∅</string> - <string name="keylabel_for_comma">,</string> - <string name="keylabel_for_f1">,</string> - <string name="keylabel_for_symbols_question">\?</string> - <string name="keylabel_for_symbols_semicolon">;</string> - <string name="keylabel_for_symbols_percent">%</string> - <string name="alternates_for_comma"></string> - <string name="alternates_for_f1"></string> - <!-- @icon/3 is iconSettingsKey --> - <string name="alternates_for_f1_settings">\@icon/3|\@integer/key_settings</string> - <!-- @icon/7 is iconTabKey --> - <string name="alternates_for_f1_navigate">\@icon/7|\@integer/key_tab</string> - <string name="alternates_for_symbols_question">¿</string> - <string name="alternates_for_symbols_semicolon"></string> - <string name="alternates_for_symbols_percent">‰</string> - <string name="keylabel_for_apostrophe">\'</string> - <string name="keylabel_for_dash">-</string> - <string name="keyhintlabel_for_apostrophe">\"</string> - <string name="keyhintlabel_for_dash">_</string> - <string name="alternates_for_apostrophe">\"</string> - <string name="alternates_for_dash">_</string> -</resources> diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml new file mode 100644 index 000000000..7e396b690 --- /dev/null +++ b/java/res/values/donottranslate-more-keys.xml @@ -0,0 +1,99 @@ +<?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="more_keys_for_a"></string> + <string name="more_keys_for_e">3</string> + <string name="more_keys_for_i">8</string> + <string name="more_keys_for_o">9</string> + <string name="more_keys_for_u">7</string> + <string name="more_keys_for_s"></string> + <string name="more_keys_for_n"></string> + <string name="more_keys_for_c"></string> + <string name="more_keys_for_y">6</string> + <string name="more_keys_for_q">1</string> + <string name="more_keys_for_w">2</string> + <string name="more_keys_for_d"></string> + <string name="more_keys_for_r">4</string> + <string name="more_keys_for_t">5</string> + <string name="more_keys_for_z"></string> + <string name="more_keys_for_k"></string> + <string name="more_keys_for_l"></string> + <string name="more_keys_for_g"></string> + <string name="more_keys_for_p">0</string> + <string name="more_keys_for_v"></string> + <string name="keylabel_for_scandinavia_row2_10"></string> + <string name="keylabel_for_scandinavia_row2_11"></string> + <string name="more_keys_for_scandinavia_row2_10"></string> + <string name="more_keys_for_scandinavia_row2_11"></string> + <string name="more_keys_for_cyrillic_e"></string> + <string name="more_keys_for_cyrillic_soft_sign"></string> + <string name="more_keys_for_cyrillic_ha"></string> + <string name="more_keys_for_currency_dollar">¢,£,€,¥,₱</string> + <string name="more_keys_for_currency_euro">¢,£,$,¥,₱</string> + <string name="more_keys_for_currency_pound">¢,$,€,¥,₱</string> + <string name="more_keys_for_currency_general">¢,$,€,£,¥,₱</string> + <string name="more_keys_for_smiley">":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\\\\\|:-\\\\\\\\ ,:\'(|:\'( ,:-D|:-D "</string> + <string name="more_keys_for_punctuation">"\\,,\?,!,:,-,\',\",(,),/,;,+,&,\@"</string> + <integer name="mini_keyboard_column_for_punctuation">7</integer> + <string name="keyhintlabel_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="more_keys_for_popular_domain">".net,.org,.gov,.edu"</string> + <string name="keylabel_for_symbols_1">1</string> + <string name="keylabel_for_symbols_2">2</string> + <string name="keylabel_for_symbols_3">3</string> + <string name="keylabel_for_symbols_4">4</string> + <string name="keylabel_for_symbols_5">5</string> + <string name="keylabel_for_symbols_6">6</string> + <string name="keylabel_for_symbols_7">7</string> + <string name="keylabel_for_symbols_8">8</string> + <string name="keylabel_for_symbols_9">9</string> + <string name="keylabel_for_symbols_0">0</string> + <string name="more_keys_for_symbols_1">¹,½,⅓,¼,⅛</string> + <string name="more_keys_for_symbols_2">²,⅔</string> + <string name="more_keys_for_symbols_3">³,¾,⅜</string> + <string name="more_keys_for_symbols_4">⁴</string> + <string name="more_keys_for_symbols_5">⅝</string> + <string name="more_keys_for_symbols_6"></string> + <string name="more_keys_for_symbols_7">⅞</string> + <string name="more_keys_for_symbols_8"></string> + <string name="more_keys_for_symbols_9"></string> + <string name="more_keys_for_symbols_0">ⁿ,∅</string> + <string name="keylabel_for_comma">,</string> + <string name="keylabel_for_f1">,</string> + <string name="keylabel_for_symbols_question">\?</string> + <string name="keylabel_for_symbols_semicolon">;</string> + <string name="keylabel_for_symbols_percent">%</string> + <string name="more_keys_for_comma"></string> + <string name="more_keys_for_f1"></string> + <!-- @icon/3 is iconSettingsKey --> + <string name="more_keys_for_f1_settings">\@icon/3|\@integer/key_settings</string> + <!-- @icon/7 is iconTabKey --> + <string name="more_keys_for_f1_navigate">\@icon/7|\@integer/key_tab</string> + <string name="more_keys_for_symbols_question">¿</string> + <string name="more_keys_for_symbols_semicolon"></string> + <string name="more_keys_for_symbols_percent">‰</string> + <string name="keylabel_for_apostrophe">\'</string> + <string name="keylabel_for_dash">-</string> + <string name="keyhintlabel_for_apostrophe">\"</string> + <string name="keyhintlabel_for_dash">_</string> + <string name="more_keys_for_apostrophe">\"</string> + <string name="more_keys_for_dash">_</string> +</resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 247bdba41..2a3d705b0 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -332,11 +332,11 @@ <!-- Title of the item to change the keyboard theme [CHAR LIMIT=20]--> <string name="keyboard_layout">Keyboard theme</string> - <!-- Description for German QWERTY keyboard subtype [CHAR LIMIT=35] --> + <!-- Description for German QWERTY keyboard subtype [CHAR LIMIT=22] --> <string name="subtype_de_qwerty">German QWERTY</string> - <!-- Description for English (United Kingdom) keyboard subtype [CHAR LIMIT=35] --> + <!-- Description for English (United Kingdom) keyboard subtype [CHAR LIMIT=22] --> <string name="subtype_en_GB">English (UK)</string> - <!-- Description for English (United States) keyboard subtype [CHAR LIMIT=35] --> + <!-- Description for English (United States) keyboard subtype [CHAR LIMIT=22] --> <string name="subtype_en_US">English (US)</string> <!-- Title of an option for usability study mode --> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index eb5b749dd..4cc2a5306 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -21,12 +21,12 @@ <item name="keyboardHeight">@dimen/keyboardHeight</item> <item name="maxKeyboardHeight">@fraction/maxKeyboardHeight</item> <item name="minKeyboardHeight">@fraction/minKeyboardHeight</item> - <item name="popupTemplate">@xml/kbd_mini_keyboard_template</item> + <item name="moreKeysTemplate">@xml/kbd_mini_keyboard_template</item> <item name="keyboardTopPadding">@fraction/keyboard_top_padding</item> <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding</item> <item name="horizontalGap">@fraction/key_horizontal_gap</item> <item name="verticalGap">@fraction/key_bottom_gap</item> - <item name="maxMiniKeyboardColumn">@integer/config_max_mini_keyboard_column</item> + <item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item> </style> <style name="LatinKeyboard"> <item name="autoCorrectionSpacebarLedEnabled">@bool/config_auto_correction_spacebar_led_enabled @@ -61,7 +61,7 @@ <item name="keyPreviewOffset">@dimen/key_preview_offset</item> <item name="keyPreviewHeight">@dimen/key_preview_height</item> <item name="keyPreviewTextRatio">@fraction/key_preview_text_ratio</item> - <item name="popupLayout">@layout/mini_keyboard</item> + <item name="moreKeysLayout">@layout/mini_keyboard</item> <item name="verticalCorrection">@dimen/keyboard_vertical_correction</item> <item name="shadowColor">#BB000000</item> <item name="shadowRadius">2.75</item> @@ -79,6 +79,11 @@ <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_edges_padding</item> <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_edges_padding</item> </style> + <style + name="SuggestionsPaneViewStyle" + parent="MiniKeyboardView" + > + </style> <style name="SuggestionsStripBackgroundStyle"> <item name="android:background">@drawable/keyboard_suggest_strip</item> </style> @@ -236,6 +241,11 @@ > </style> <style + name="SuggestionsPaneViewStyle.IceCreamSandwich" + parent="MiniKeyboardView.IceCreamSandwich" + > + </style> + <style name="CandidateViewStyle.IceCreamSandwich" parent="SuggestionsStripBackgroundStyle.IceCreamSandwich" > diff --git a/java/res/values/themes-basic-highcontrast.xml b/java/res/values/themes-basic-highcontrast.xml index 17c06a278..51bf2f1d2 100644 --- a/java/res/values/themes-basic-highcontrast.xml +++ b/java/res/values/themes-basic-highcontrast.xml @@ -22,6 +22,7 @@ <item name="miniKeyboardViewStyle">@style/MiniKeyboardView</item> <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> + <item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> <item name="candidateViewStyle">@style/CandidateViewStyle</item> diff --git a/java/res/values/themes-basic.xml b/java/res/values/themes-basic.xml index 23c71bd6f..7288dbacb 100644 --- a/java/res/values/themes-basic.xml +++ b/java/res/values/themes-basic.xml @@ -22,6 +22,7 @@ <item name="miniKeyboardViewStyle">@style/MiniKeyboardView</item> <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> + <item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> <item name="candidateViewStyle">@style/CandidateViewStyle</item> diff --git a/java/res/values/themes-gingerbread.xml b/java/res/values/themes-gingerbread.xml index 1e3419f8c..5b62378f6 100644 --- a/java/res/values/themes-gingerbread.xml +++ b/java/res/values/themes-gingerbread.xml @@ -22,6 +22,7 @@ <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Gingerbread</item> <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> + <item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> <item name="candidateViewStyle">@style/CandidateViewStyle</item> diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml index 7fa879cad..597d87b4c 100644 --- a/java/res/values/themes-ics.xml +++ b/java/res/values/themes-ics.xml @@ -22,6 +22,7 @@ <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.IceCreamSandwich</item> <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle.IceCreamSandwich</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle.IceCreamSandwich</item> + <item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle.IceCreamSandwich</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle.IceCreamSandwich</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle.IceCreamSandwich</item> <item name="candidateViewStyle">@style/CandidateViewStyle.IceCreamSandwich</item> diff --git a/java/res/values/themes-stone-bold.xml b/java/res/values/themes-stone-bold.xml index fa2ee2dfd..ff7107d32 100644 --- a/java/res/values/themes-stone-bold.xml +++ b/java/res/values/themes-stone-bold.xml @@ -22,7 +22,8 @@ <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Stone</item> <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> - <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> + <item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle</item> + <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> <item name="candidateViewStyle">@style/CandidateViewStyle</item> </style> diff --git a/java/res/values/themes-stone.xml b/java/res/values/themes-stone.xml index 494bae600..35390d111 100644 --- a/java/res/values/themes-stone.xml +++ b/java/res/values/themes-stone.xml @@ -22,6 +22,7 @@ <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Stone</item> <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item> <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item> + <item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle</item> <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item> <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item> <item name="candidateViewStyle">@style/CandidateViewStyle</item> diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml index 43b6623a9..2c31e27e4 100644 --- a/java/res/xml-sw600dp/kbd_key_styles.xml +++ b/java/res/xml-sw600dp/kbd_key_styles.xml @@ -38,7 +38,7 @@ <key-style latin:styleName="f2PopupStyle" latin:keyLabelOption="hasPopupHint" - latin:popupCharacters="\@icon/3|\@integer/key_settings" + latin:moreKeys="\@icon/3|\@integer/key_settings" latin:parentStyle="functionalKeyStyle" /> </default> </switch> @@ -72,8 +72,8 @@ latin:keyLabel=":-)" latin:keyOutputText=":-) " latin:keyLabelOption="hasPopupHint" - latin:popupCharacters="@string/alternates_for_smiley" - latin:maxMiniKeyboardColumn="5" /> + latin:moreKeys="@string/more_keys_for_smiley" + latin:maxMoreKeysColumn="5" /> <key-style latin:styleName="shortcutKeyStyle" latin:code="@integer/key_shortcut" @@ -117,5 +117,5 @@ latin:keyLabel="@string/keylabel_for_popular_domain" latin:keyLabelOption="fontNormal|hasPopupHint" latin:keyOutputText="@string/keylabel_for_popular_domain" - latin:popupCharacters="@string/alternates_for_popular_domain" /> + latin:moreKeys="@string/more_keys_for_popular_domain" /> </merge> diff --git a/java/res/xml-sw600dp/kbd_popup_template.xml b/java/res/xml-sw600dp/kbd_mini_keyboard_template.xml index d97649965..9955fe8fd 100644 --- a/java/res/xml-sw600dp/kbd_popup_template.xml +++ b/java/res/xml-sw600dp/kbd_mini_keyboard_template.xml @@ -20,8 +20,6 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:keyWidth="8%p" - latin:horizontalGap="@fraction/key_horizontal_gap" - latin:verticalGap="0px" latin:rowHeight="@dimen/popup_key_height" > </Keyboard> diff --git a/java/res/xml-sw600dp/kbd_qwerty_row1.xml b/java/res/xml-sw600dp/kbd_qwerty_row1.xml index c7dfcc83d..07d8e2296 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_row1.xml +++ b/java/res/xml-sw600dp/kbd_qwerty_row1.xml @@ -26,34 +26,34 @@ > <Key latin:keyLabel="q" - latin:popupCharacters="@string/alternates_for_q" /> + latin:moreKeys="@string/more_keys_for_q" /> <Key latin:keyLabel="w" - latin:popupCharacters="@string/alternates_for_w" /> + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="e" - latin:popupCharacters="@string/alternates_for_e" /> + latin:moreKeys="@string/more_keys_for_e" /> <Key latin:keyLabel="r" - latin:popupCharacters="@string/alternates_for_r" /> + latin:moreKeys="@string/more_keys_for_r" /> <Key latin:keyLabel="t" - latin:popupCharacters="@string/alternates_for_t" /> + latin:moreKeys="@string/more_keys_for_t" /> <Key latin:keyLabel="y" - latin:popupCharacters="@string/alternates_for_y" /> + latin:moreKeys="@string/more_keys_for_y" /> <Key latin:keyLabel="u" - latin:popupCharacters="@string/alternates_for_u" /> + latin:moreKeys="@string/more_keys_for_u" /> <Key latin:keyLabel="i" - latin:popupCharacters="@string/alternates_for_i" /> + latin:moreKeys="@string/more_keys_for_i" /> <Key latin:keyLabel="o" - latin:popupCharacters="@string/alternates_for_o" /> + latin:moreKeys="@string/more_keys_for_o" /> <Key latin:keyLabel="p" - latin:popupCharacters="@string/alternates_for_p" /> + latin:moreKeys="@string/more_keys_for_p" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-10.0%p" diff --git a/java/res/xml-sw600dp/kbd_qwerty_row2.xml b/java/res/xml-sw600dp/kbd_qwerty_row2.xml index 78004fe4f..52a948f20 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_row2.xml +++ b/java/res/xml-sw600dp/kbd_qwerty_row2.xml @@ -26,29 +26,29 @@ > <Key latin:keyLabel="a" - latin:popupCharacters="@string/alternates_for_a" + latin:moreKeys="@string/more_keys_for_a" latin:keyXPos="4.5%p" /> <Key latin:keyLabel="s" - latin:popupCharacters="@string/alternates_for_s" /> + latin:moreKeys="@string/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:popupCharacters="@string/alternates_for_d" /> + latin:moreKeys="@string/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupCharacters="@string/alternates_for_g" /> + latin:moreKeys="@string/more_keys_for_g" /> <Key latin:keyLabel="h" /> <Key latin:keyLabel="j" /> <Key latin:keyLabel="k" - latin:popupCharacters="@string/alternates_for_k" /> + latin:moreKeys="@string/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:popupCharacters="@string/alternates_for_l" /> + latin:moreKeys="@string/more_keys_for_l" /> <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-14.6%p" diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/kbd_qwerty_row3.xml index 456f3c8ca..4dabf633c 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml +++ b/java/res/xml-sw600dp/kbd_qwerty_row3.xml @@ -29,20 +29,20 @@ latin:keyWidth="10.0%p" /> <Key latin:keyLabel="z" - latin:popupCharacters="@string/alternates_for_z" /> + latin:moreKeys="@string/more_keys_for_z" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupCharacters="@string/alternates_for_c" /> + latin:moreKeys="@string/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:popupCharacters="@string/alternates_for_v" /> + latin:moreKeys="@string/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupCharacters="@string/alternates_for_n" /> + latin:moreKeys="@string/more_keys_for_n" /> <Key latin:keyLabel="m" /> <include diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/kbd_qwerty_row4.xml index 4c978cb2c..ef0292279 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml +++ b/java/res/xml-sw600dp/kbd_qwerty_row4.xml @@ -47,7 +47,7 @@ latin:keyLabel="/" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="\@" - latin:popupCharacters="\@" /> + latin:moreKeys="\@" /> </default> </switch> <Key diff --git a/java/res/xml-sw600dp/kbd_row3_comma_period.xml b/java/res/xml-sw600dp/kbd_row3_comma_period.xml index 25453160f..b84443078 100644 --- a/java/res/xml-sw600dp/kbd_row3_comma_period.xml +++ b/java/res/xml-sw600dp/kbd_row3_comma_period.xml @@ -35,12 +35,12 @@ latin:keyLabel="," latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="!" - latin:popupCharacters="!" /> + latin:moreKeys="!" /> <Key latin:keyLabel="." latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="\?" - latin:popupCharacters="\?" /> + latin:moreKeys="\?" /> </default> </switch> </merge> diff --git a/java/res/xml-sw600dp/kbd_row3_smiley.xml b/java/res/xml-sw600dp/kbd_row3_smiley.xml index 0ae3ae474..f9b647cdf 100644 --- a/java/res/xml-sw600dp/kbd_row3_smiley.xml +++ b/java/res/xml-sw600dp/kbd_row3_smiley.xml @@ -37,7 +37,7 @@ latin:keyLabel="-" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="_" - latin:popupCharacters="_" + latin:moreKeys="_" latin:keyXPos="-8.9%p" latin:keyWidth="fillBoth" /> </case> @@ -48,7 +48,7 @@ latin:keyLabel=":" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="+" - latin:popupCharacters="+" + latin:moreKeys="+" latin:keyXPos="-8.9%p" latin:keyWidth="fillBoth" /> </case> diff --git a/java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml b/java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml index 50d4d4b10..9536e81da 100644 --- a/java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml +++ b/java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml @@ -35,14 +35,14 @@ latin:keyLabel="/" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel=":" - latin:popupCharacters=":" /> + latin:moreKeys=":" /> </case> <default> <Key latin:keyLabel="@string/keylabel_for_apostrophe" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="@string/keyhintlabel_for_apostrophe" - latin:popupCharacters="@string/alternates_for_apostrophe" /> + latin:moreKeys="@string/more_keys_for_apostrophe" /> </default> </switch> <switch> @@ -57,7 +57,7 @@ latin:keyLabel="@string/keylabel_for_dash" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="@string/keyhintlabel_for_dash" - latin:popupCharacters="@string/alternates_for_dash" /> + latin:moreKeys="@string/more_keys_for_dash" /> </default> </switch> </merge> diff --git a/java/res/xml-sw600dp/kbd_rows_arabic.xml b/java/res/xml-sw600dp/kbd_rows_arabic.xml index 4c20f51ca..275df50a5 100644 --- a/java/res/xml-sw600dp/kbd_rows_arabic.xml +++ b/java/res/xml-sw600dp/kbd_rows_arabic.xml @@ -36,7 +36,7 @@ latin:keyLabel="ق" /> <Key latin:keyLabel="ف" - latin:popupCharacters="ڤ" /> + latin:moreKeys="ڤ" /> <Key latin:keyLabel="غ" /> <Key @@ -45,14 +45,14 @@ \u0647\u0640: ARABIC LETTER HEH + ARABIC TATWEEL --> <Key latin:keyLabel="ه" - latin:popupCharacters="\ufeeb|\u0647\u0640" /> + latin:moreKeys="\ufeeb|\u0647\u0640" /> <Key latin:keyLabel="خ" /> <Key latin:keyLabel="ح" /> <Key latin:keyLabel="ج" - latin:popupCharacters="چ" /> + latin:moreKeys="چ" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-10.0%p" @@ -70,7 +70,7 @@ latin:keyLabel="ي" /> <Key latin:keyLabel="ب" - latin:popupCharacters="پ" /> + latin:moreKeys="پ" /> <!-- \ufefb: ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM \u0644: ARABIC LETTER LAM \u0627: ARABIC LETTER ALEF @@ -82,13 +82,13 @@ \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE --> <Key latin:keyLabel="ل" - latin:popupCharacters="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" /> + latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" /> <!-- \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE --> <Key latin:keyLabel="ا" - latin:popupCharacters="\u0623,\u0625,\u0622" /> + latin:moreKeys="\u0623,\u0625,\u0622" /> <Key latin:keyLabel="ت" /> <Key @@ -97,7 +97,7 @@ latin:keyLabel="م" /> <Key latin:keyLabel="ك" - latin:popupCharacters="گ" /> + latin:moreKeys="گ" /> <Key latin:keyLabel="ط" /> <Key @@ -123,7 +123,7 @@ latin:keyLabel="-" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="_" - latin:popupCharacters="_" /> + latin:moreKeys="_" /> </case> <case latin:imeAction="actionSearch" @@ -132,7 +132,7 @@ latin:keyLabel=":" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="+" - latin:popupCharacters="+" /> + latin:moreKeys="+" /> </case> <default> <Key @@ -157,7 +157,7 @@ latin:keyLabel="و" /> <Key latin:keyLabel="ز" - latin:popupCharacters="ژ" /> + latin:moreKeys="ژ" /> <Key latin:keyLabel="ظ" /> <Key diff --git a/java/res/xml-sw600dp/kbd_rows_azerty.xml b/java/res/xml-sw600dp/kbd_rows_azerty.xml index 406b4e670..8ae74557c 100644 --- a/java/res/xml-sw600dp/kbd_rows_azerty.xml +++ b/java/res/xml-sw600dp/kbd_rows_azerty.xml @@ -28,34 +28,34 @@ > <Key latin:keyLabel="a" - latin:popupCharacters="@string/alternates_for_a" /> + latin:moreKeys="@string/more_keys_for_a" /> <Key latin:keyLabel="z" - latin:popupCharacters="@string/alternates_for_z" /> + latin:moreKeys="@string/more_keys_for_z" /> <Key latin:keyLabel="e" - latin:popupCharacters="@string/alternates_for_e" /> + latin:moreKeys="@string/more_keys_for_e" /> <Key latin:keyLabel="r" - latin:popupCharacters="@string/alternates_for_r" /> + latin:moreKeys="@string/more_keys_for_r" /> <Key latin:keyLabel="t" - latin:popupCharacters="@string/alternates_for_t" /> + latin:moreKeys="@string/more_keys_for_t" /> <Key latin:keyLabel="y" - latin:popupCharacters="@string/alternates_for_y" /> + latin:moreKeys="@string/more_keys_for_y" /> <Key latin:keyLabel="u" - latin:popupCharacters="@string/alternates_for_u" /> + latin:moreKeys="@string/more_keys_for_u" /> <Key latin:keyLabel="i" - latin:popupCharacters="@string/alternates_for_i" /> + latin:moreKeys="@string/more_keys_for_i" /> <Key latin:keyLabel="o" - latin:popupCharacters="@string/alternates_for_o" /> + latin:moreKeys="@string/more_keys_for_o" /> <Key latin:keyLabel="p" - latin:popupCharacters="@string/alternates_for_p" /> + latin:moreKeys="@string/more_keys_for_p" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-10.0%p" @@ -66,29 +66,29 @@ > <Key latin:keyLabel="q" - latin:popupCharacters="@string/alternates_for_q" + latin:moreKeys="@string/more_keys_for_q" latin:keyXPos="5.0%p" /> <Key latin:keyLabel="s" - latin:popupCharacters="@string/alternates_for_s" /> + latin:moreKeys="@string/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:popupCharacters="@string/alternates_for_d" /> + latin:moreKeys="@string/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupCharacters="@string/alternates_for_g" /> + latin:moreKeys="@string/more_keys_for_g" /> <Key latin:keyLabel="h" /> <Key latin:keyLabel="j" /> <Key latin:keyLabel="k" - latin:popupCharacters="@string/alternates_for_k" /> + latin:moreKeys="@string/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:popupCharacters="@string/alternates_for_l" /> + latin:moreKeys="@string/more_keys_for_l" /> <Key latin:keyLabel="m" /> <Key @@ -104,20 +104,20 @@ latin:keyWidth="10.0%p" /> <Key latin:keyLabel="w" - latin:popupCharacters="@string/alternates_for_w" /> + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupCharacters="@string/alternates_for_c" /> + latin:moreKeys="@string/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:popupCharacters="@string/alternates_for_v" /> + latin:moreKeys="@string/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupCharacters="@string/alternates_for_n" /> + latin:moreKeys="@string/more_keys_for_n" /> <Key latin:keyLabel="\'" /> <switch> @@ -134,12 +134,12 @@ latin:keyLabel="," latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="!" - latin:popupCharacters="!" /> + latin:moreKeys="!" /> <Key latin:keyLabel="." latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="\?" - latin:popupCharacters="\?" /> + latin:moreKeys="\?" /> </default> </switch> <include diff --git a/java/res/xml-sw600dp/kbd_rows_hebrew.xml b/java/res/xml-sw600dp/kbd_rows_hebrew.xml index fc2247cb0..a8adbd34c 100644 --- a/java/res/xml-sw600dp/kbd_rows_hebrew.xml +++ b/java/res/xml-sw600dp/kbd_rows_hebrew.xml @@ -59,17 +59,17 @@ latin:keyLabel="ד" /> <Key latin:keyLabel="ג" - latin:popupCharacters="ג׳" /> + latin:moreKeys="ג׳" /> <Key latin:keyLabel="כ" /> <Key latin:keyLabel="ע" /> <Key latin:keyLabel="י" - latin:popupCharacters="ײַ" /> + latin:moreKeys="ײַ" /> <Key latin:keyLabel="ח" - latin:popupCharacters="ח׳" /> + latin:moreKeys="ח׳" /> <Key latin:keyLabel="ל" /> <Key @@ -96,7 +96,7 @@ latin:keyLabel="-" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="_" - latin:popupCharacters="_" + latin:moreKeys="_" latin:keyWidth="10.0%p" /> </case> <case @@ -106,7 +106,7 @@ latin:keyLabel=":" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="+" - latin:popupCharacters="+" + latin:moreKeys="+" latin:keyWidth="10.0%p" /> </case> <default> @@ -117,7 +117,7 @@ </switch> <Key latin:keyLabel="ז" - latin:popupCharacters="ז׳" /> + latin:moreKeys="ז׳" /> <Key latin:keyLabel="ס" /> <Key @@ -130,13 +130,13 @@ latin:keyLabel="מ" /> <Key latin:keyLabel="צ" - latin:popupCharacters="צ׳" /> + latin:moreKeys="צ׳" /> <Key latin:keyLabel="ת" - latin:popupCharacters="ת׳" /> + latin:moreKeys="ת׳" /> <Key latin:keyLabel="ץ" - latin:popupCharacters="ץ׳" /> + latin:moreKeys="ץ׳" /> <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-10.400%p" diff --git a/java/res/xml-sw600dp/kbd_rows_qwertz.xml b/java/res/xml-sw600dp/kbd_rows_qwertz.xml index 3d177e72d..98667e09c 100644 --- a/java/res/xml-sw600dp/kbd_rows_qwertz.xml +++ b/java/res/xml-sw600dp/kbd_rows_qwertz.xml @@ -28,34 +28,34 @@ > <Key latin:keyLabel="q" - latin:popupCharacters="@string/alternates_for_q" /> + latin:moreKeys="@string/more_keys_for_q" /> <Key latin:keyLabel="w" - latin:popupCharacters="@string/alternates_for_w" /> + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="e" - latin:popupCharacters="@string/alternates_for_e" /> + latin:moreKeys="@string/more_keys_for_e" /> <Key latin:keyLabel="r" - latin:popupCharacters="@string/alternates_for_r" /> + latin:moreKeys="@string/more_keys_for_r" /> <Key latin:keyLabel="t" - latin:popupCharacters="@string/alternates_for_t" /> + latin:moreKeys="@string/more_keys_for_t" /> <Key latin:keyLabel="z" - latin:popupCharacters="@string/alternates_for_z" /> + latin:moreKeys="@string/more_keys_for_z" /> <Key latin:keyLabel="u" - latin:popupCharacters="@string/alternates_for_u" /> + latin:moreKeys="@string/more_keys_for_u" /> <Key latin:keyLabel="i" - latin:popupCharacters="@string/alternates_for_i" /> + latin:moreKeys="@string/more_keys_for_i" /> <Key latin:keyLabel="o" - latin:popupCharacters="@string/alternates_for_o" /> + latin:moreKeys="@string/more_keys_for_o" /> <Key latin:keyLabel="p" - latin:popupCharacters="@string/alternates_for_p" /> + latin:moreKeys="@string/more_keys_for_p" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-10.0%p" @@ -71,20 +71,20 @@ latin:keyWidth="10.0%p" /> <Key latin:keyLabel="y" - latin:popupCharacters="@string/alternates_for_y" /> + latin:moreKeys="@string/more_keys_for_y" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupCharacters="@string/alternates_for_c" /> + latin:moreKeys="@string/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:popupCharacters="@string/alternates_for_v" /> + latin:moreKeys="@string/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupCharacters="@string/alternates_for_n" /> + latin:moreKeys="@string/more_keys_for_n" /> <Key latin:keyLabel="m" /> <switch> @@ -101,12 +101,12 @@ latin:keyLabel="," latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="!" - latin:popupCharacters="!" /> + latin:moreKeys="!" /> <Key latin:keyLabel="." latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="\?" - latin:popupCharacters="\?" /> + latin:moreKeys="\?" /> </default> </switch> <include diff --git a/java/res/xml-sw600dp/kbd_rows_russian.xml b/java/res/xml-sw600dp/kbd_rows_russian.xml index 2f4b95e60..cc9ad3aa7 100644 --- a/java/res/xml-sw600dp/kbd_rows_russian.xml +++ b/java/res/xml-sw600dp/kbd_rows_russian.xml @@ -36,7 +36,7 @@ latin:keyLabel="к" /> <Key latin:keyLabel="е" - latin:popupCharacters="@string/alternates_for_cyrillic_e" /> + latin:moreKeys="@string/more_keys_for_cyrillic_e" /> <Key latin:keyLabel="н" /> <Key @@ -124,12 +124,12 @@ latin:keyLabel="," latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="!" - latin:popupCharacters="!" /> + latin:moreKeys="!" /> <Key latin:keyLabel="." latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="\?" - latin:popupCharacters="\?" /> + latin:moreKeys="\?" /> </default> </switch> <include diff --git a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml b/java/res/xml-sw600dp/kbd_rows_scandinavian.xml index 505913726..19fb5212b 100644 --- a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml +++ b/java/res/xml-sw600dp/kbd_rows_scandinavian.xml @@ -28,34 +28,34 @@ > <Key latin:keyLabel="q" - latin:popupCharacters="@string/alternates_for_q" /> + latin:moreKeys="@string/more_keys_for_q" /> <Key latin:keyLabel="w" - latin:popupCharacters="@string/alternates_for_w" /> + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="e" - latin:popupCharacters="@string/alternates_for_e" /> + latin:moreKeys="@string/more_keys_for_e" /> <Key latin:keyLabel="r" - latin:popupCharacters="@string/alternates_for_r" /> + latin:moreKeys="@string/more_keys_for_r" /> <Key latin:keyLabel="t" - latin:popupCharacters="@string/alternates_for_t" /> + latin:moreKeys="@string/more_keys_for_t" /> <Key latin:keyLabel="y" - latin:popupCharacters="@string/alternates_for_y" /> + latin:moreKeys="@string/more_keys_for_y" /> <Key latin:keyLabel="u" - latin:popupCharacters="@string/alternates_for_u" /> + latin:moreKeys="@string/more_keys_for_u" /> <Key latin:keyLabel="i" - latin:popupCharacters="@string/alternates_for_i" /> + latin:moreKeys="@string/more_keys_for_i" /> <Key latin:keyLabel="o" - latin:popupCharacters="@string/alternates_for_o" /> + latin:moreKeys="@string/more_keys_for_o" /> <Key latin:keyLabel="p" - latin:popupCharacters="@string/alternates_for_p" /> + latin:moreKeys="@string/more_keys_for_p" /> <Key latin:keyLabel="å" /> <Key @@ -69,34 +69,34 @@ <Key latin:keyLabel="a" latin:keyXPos="3.5%p" - latin:popupCharacters="@string/alternates_for_a" /> + latin:moreKeys="@string/more_keys_for_a" /> <Key latin:keyLabel="s" - latin:popupCharacters="@string/alternates_for_s" /> + latin:moreKeys="@string/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:popupCharacters="@string/alternates_for_d" /> + latin:moreKeys="@string/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupCharacters="@string/alternates_for_g" /> + latin:moreKeys="@string/more_keys_for_g" /> <Key latin:keyLabel="h" /> <Key latin:keyLabel="j" /> <Key latin:keyLabel="k" - latin:popupCharacters="@string/alternates_for_k" /> + latin:moreKeys="@string/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:popupCharacters="@string/alternates_for_l" /> + latin:moreKeys="@string/more_keys_for_l" /> <Key latin:keyLabel="@string/keylabel_for_scandinavia_row2_10" - latin:popupCharacters="@string/alternates_for_scandinavia_row2_10" /> + latin:moreKeys="@string/more_keys_for_scandinavia_row2_10" /> <Key latin:keyLabel="@string/keylabel_for_scandinavia_row2_11" - latin:popupCharacters="@string/alternates_for_scandinavia_row2_11" /> + latin:moreKeys="@string/more_keys_for_scandinavia_row2_11" /> <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-14.6%p" @@ -112,20 +112,20 @@ latin:keyWidth="4.35%p" /> <Key latin:keyLabel="z" - latin:popupCharacters="@string/alternates_for_z" /> + latin:moreKeys="@string/more_keys_for_z" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupCharacters="@string/alternates_for_c" /> + latin:moreKeys="@string/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:popupCharacters="@string/alternates_for_v" /> + latin:moreKeys="@string/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupCharacters="@string/alternates_for_n" /> + latin:moreKeys="@string/more_keys_for_n" /> <Key latin:keyLabel="m" /> <include diff --git a/java/res/xml-sw600dp/kbd_rows_spanish.xml b/java/res/xml-sw600dp/kbd_rows_spanish.xml index 49243eb5c..8506af697 100644 --- a/java/res/xml-sw600dp/kbd_rows_spanish.xml +++ b/java/res/xml-sw600dp/kbd_rows_spanish.xml @@ -30,29 +30,29 @@ > <Key latin:keyLabel="a" - latin:popupCharacters="@string/alternates_for_a" + latin:moreKeys="@string/more_keys_for_a" latin:keyXPos="5.0%p" /> <Key latin:keyLabel="s" - latin:popupCharacters="@string/alternates_for_s" /> + latin:moreKeys="@string/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:popupCharacters="@string/alternates_for_d" /> + latin:moreKeys="@string/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupCharacters="@string/alternates_for_g" /> + latin:moreKeys="@string/more_keys_for_g" /> <Key latin:keyLabel="h" /> <Key latin:keyLabel="j" /> <Key latin:keyLabel="k" - latin:popupCharacters="@string/alternates_for_k" /> + latin:moreKeys="@string/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:popupCharacters="@string/alternates_for_l" /> + latin:moreKeys="@string/more_keys_for_l" /> <Key latin:keyLabel="ñ" /> <Key diff --git a/java/res/xml-sw600dp/kbd_rows_symbols.xml b/java/res/xml-sw600dp/kbd_rows_symbols.xml index 420e46cce..d3513c9c6 100644 --- a/java/res/xml-sw600dp/kbd_rows_symbols.xml +++ b/java/res/xml-sw600dp/kbd_rows_symbols.xml @@ -30,34 +30,34 @@ > <Key latin:keyLabel="@string/keylabel_for_symbols_1" - latin:popupCharacters="@string/alternates_for_symbols_1" /> + latin:moreKeys="@string/more_keys_for_symbols_1" /> <Key latin:keyLabel="@string/keylabel_for_symbols_2" - latin:popupCharacters="@string/alternates_for_symbols_2" /> + latin:moreKeys="@string/more_keys_for_symbols_2" /> <Key latin:keyLabel="@string/keylabel_for_symbols_3" - latin:popupCharacters="@string/alternates_for_symbols_3" /> + latin:moreKeys="@string/more_keys_for_symbols_3" /> <Key latin:keyLabel="@string/keylabel_for_symbols_4" - latin:popupCharacters="@string/alternates_for_symbols_4" /> + latin:moreKeys="@string/more_keys_for_symbols_4" /> <Key latin:keyLabel="@string/keylabel_for_symbols_5" - latin:popupCharacters="@string/alternates_for_symbols_5" /> + latin:moreKeys="@string/more_keys_for_symbols_5" /> <Key latin:keyLabel="@string/keylabel_for_symbols_6" - latin:popupCharacters="@string/alternates_for_symbols_6" /> + latin:moreKeys="@string/more_keys_for_symbols_6" /> <Key latin:keyLabel="@string/keylabel_for_symbols_7" - latin:popupCharacters="@string/alternates_for_symbols_7" /> + latin:moreKeys="@string/more_keys_for_symbols_7" /> <Key latin:keyLabel="@string/keylabel_for_symbols_8" - latin:popupCharacters="@string/alternates_for_symbols_8" /> + latin:moreKeys="@string/more_keys_for_symbols_8" /> <Key latin:keyLabel="@string/keylabel_for_symbols_9" - latin:popupCharacters="@string/alternates_for_symbols_9" /> + latin:moreKeys="@string/more_keys_for_symbols_9" /> <Key latin:keyLabel="@string/keylabel_for_symbols_0" - latin:popupCharacters="@string/alternates_for_symbols_0" /> + latin:moreKeys="@string/more_keys_for_symbols_0" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-10.0%p" @@ -73,24 +73,24 @@ latin:keyStyle="currencyKeyStyle" /> <Key latin:keyLabel="@string/keylabel_for_symbols_percent" - latin:popupCharacters="@string/alternates_for_symbols_percent" /> + latin:moreKeys="@string/more_keys_for_symbols_percent" /> <Key latin:keyLabel="&" /> <Key latin:keyLabel="*" - latin:popupCharacters="†,‡,★" /> + latin:moreKeys="†,‡,★" /> <Key latin:keyLabel="-" - latin:popupCharacters="_,–,—" /> + latin:moreKeys="_,–,—" /> <Key latin:keyLabel="+" - latin:popupCharacters="±" /> + latin:moreKeys="±" /> <Key latin:keyLabel="(" - latin:popupCharacters="[,{,<" /> + latin:moreKeys="[,{,<" /> <Key latin:keyLabel=")" - latin:popupCharacters="],},>" /> + latin:moreKeys="],},>" /> <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-14.6%p" @@ -104,20 +104,20 @@ latin:keyWidth="10.0%p" /> <Key latin:keyLabel="<" - latin:popupCharacters="≤,«,‹" /> + latin:moreKeys="≤,«,‹" /> <Key latin:keyLabel=">" - latin:popupCharacters="≥,»,›" /> + latin:moreKeys="≥,»,›" /> <Key latin:keyLabel="=" - latin:popupCharacters="≠,≈" /> + latin:moreKeys="≠,≈" /> <switch> <case latin:mode="url" > <Key latin:keyLabel="\'" - latin:popupCharacters="‘,’,‚,‛" /> + latin:moreKeys="‘,’,‚,‛" /> </case> <default> <Key @@ -126,18 +126,18 @@ </switch> <Key latin:keyLabel="@string/keylabel_for_symbols_semicolon" - latin:popupCharacters="@string/alternates_for_symbols_semicolon" /> + latin:moreKeys="@string/more_keys_for_symbols_semicolon" /> <Key latin:keyLabel="@string/keylabel_for_comma" - latin:popupCharacters="@string/alternates_for_comma" /> + latin:moreKeys="@string/more_keys_for_comma" /> <Key latin:keyLabel="." /> <Key latin:keyLabel="!" - latin:popupCharacters="¡" /> + latin:moreKeys="¡" /> <Key latin:keyLabel="@string/keylabel_for_symbols_question" - latin:popupCharacters="@string/alternates_for_symbols_question" /> + latin:moreKeys="@string/more_keys_for_symbols_question" /> <Key latin:keyLabel="/" latin:keyWidth="fillRight" /> @@ -157,10 +157,10 @@ latin:keyXPos="30.750%p" latin:keyWidth="39.750%p" /> <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. --> - <!-- latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛" --> + <!-- latin:moreKeys="“,”,„,‟,«,»,‘,’,‚,‛" --> <Key latin:keyLabel=""" - latin:popupCharacters="“,”,«,»,‘,’,‚,‛" /> + latin:moreKeys="“,”,«,»,‘,’,‚,‛" /> <Key latin:keyLabel="_" /> <Spacer diff --git a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml index c5143d9c8..3d62eff7e 100644 --- a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml +++ b/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml @@ -34,19 +34,19 @@ latin:keyLabel="|" /> <Key latin:keyLabel="•" - latin:popupCharacters="♪,♥,♠,♦,♣" /> + latin:moreKeys="♪,♥,♠,♦,♣" /> <Key latin:keyLabel="√" /> <Key latin:keyLabel="π" - latin:popupCharacters="Π" /> + latin:moreKeys="Π" /> <Key latin:keyLabel="÷" /> <Key latin:keyLabel="×" /> <Key latin:keyLabel="§" - latin:popupCharacters="¶" /> + latin:moreKeys="¶" /> <Key latin:keyLabel="Δ" /> <Key @@ -68,13 +68,13 @@ latin:keyLabel="¥" /> <Key latin:keyLabel="^" - latin:popupCharacters="↑,↓,←,→" /> + latin:moreKeys="↑,↓,←,→" /> <Key latin:keyLabel="°" - latin:popupCharacters="′,″" /> + latin:moreKeys="′,″" /> <Key latin:keyLabel="±" - latin:popupCharacters="∞" /> + latin:moreKeys="∞" /> <Key latin:keyLabel="{" /> <Key diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/kbd_key_styles.xml index 52ee91a37..6570ebccb 100644 --- a/java/res/xml-sw768dp/kbd_key_styles.xml +++ b/java/res/xml-sw768dp/kbd_key_styles.xml @@ -54,8 +54,8 @@ latin:keyLabel=":-)" latin:keyOutputText=":-) " latin:keyLabelOption="hasPopupHint" - latin:popupCharacters="@string/alternates_for_smiley" - latin:maxMiniKeyboardColumn="5" /> + latin:moreKeys="@string/more_keys_for_smiley" + latin:maxMoreKeysColumn="5" /> <key-style latin:styleName="settingsKeyStyle" latin:code="@integer/key_settings" @@ -103,5 +103,5 @@ latin:keyLabel="@string/keylabel_for_popular_domain" latin:keyLabelOption="fontNormal|hasPopupHint" latin:keyOutputText="@string/keylabel_for_popular_domain" - latin:popupCharacters="@string/alternates_for_popular_domain" /> + latin:moreKeys="@string/more_keys_for_popular_domain" /> </merge> diff --git a/java/res/xml-sw768dp/kbd_popup_template.xml b/java/res/xml-sw768dp/kbd_mini_keyboard_template.xml index 7d39d1a3a..1c15a5e9c 100644 --- a/java/res/xml-sw768dp/kbd_popup_template.xml +++ b/java/res/xml-sw768dp/kbd_mini_keyboard_template.xml @@ -20,8 +20,6 @@ <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" > </Keyboard> diff --git a/java/res/xml-sw768dp/kbd_qwerty_row1.xml b/java/res/xml-sw768dp/kbd_qwerty_row1.xml index 0fdb463f1..14b8bddfb 100644 --- a/java/res/xml-sw768dp/kbd_qwerty_row1.xml +++ b/java/res/xml-sw768dp/kbd_qwerty_row1.xml @@ -30,34 +30,34 @@ latin:keyWidth="7.969%p" /> <Key latin:keyLabel="q" - latin:popupCharacters="@string/alternates_for_q" /> + latin:moreKeys="@string/more_keys_for_q" /> <Key latin:keyLabel="w" - latin:popupCharacters="@string/alternates_for_w" /> + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="e" - latin:popupCharacters="@string/alternates_for_e" /> + latin:moreKeys="@string/more_keys_for_e" /> <Key latin:keyLabel="r" - latin:popupCharacters="@string/alternates_for_r" /> + latin:moreKeys="@string/more_keys_for_r" /> <Key latin:keyLabel="t" - latin:popupCharacters="@string/alternates_for_t" /> + latin:moreKeys="@string/more_keys_for_t" /> <Key latin:keyLabel="y" - latin:popupCharacters="@string/alternates_for_y" /> + latin:moreKeys="@string/more_keys_for_y" /> <Key latin:keyLabel="u" - latin:popupCharacters="@string/alternates_for_u" /> + latin:moreKeys="@string/more_keys_for_u" /> <Key latin:keyLabel="i" - latin:popupCharacters="@string/alternates_for_i" /> + latin:moreKeys="@string/more_keys_for_i" /> <Key latin:keyLabel="o" - latin:popupCharacters="@string/alternates_for_o" /> + latin:moreKeys="@string/more_keys_for_o" /> <Key latin:keyLabel="p" - latin:popupCharacters="@string/alternates_for_p" /> + latin:moreKeys="@string/more_keys_for_p" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-9.219%p" diff --git a/java/res/xml-sw768dp/kbd_qwerty_row2.xml b/java/res/xml-sw768dp/kbd_qwerty_row2.xml index 7f7dd57f0..2c312a328 100644 --- a/java/res/xml-sw768dp/kbd_qwerty_row2.xml +++ b/java/res/xml-sw768dp/kbd_qwerty_row2.xml @@ -30,28 +30,28 @@ latin:keyWidth="11.172%p"/> <Key latin:keyLabel="a" - latin:popupCharacters="@string/alternates_for_a" /> + latin:moreKeys="@string/more_keys_for_a" /> <Key latin:keyLabel="s" - latin:popupCharacters="@string/alternates_for_s" /> + latin:moreKeys="@string/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:popupCharacters="@string/alternates_for_d" /> + latin:moreKeys="@string/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupCharacters="@string/alternates_for_g" /> + latin:moreKeys="@string/more_keys_for_g" /> <Key latin:keyLabel="h" /> <Key latin:keyLabel="j" /> <Key latin:keyLabel="k" - latin:popupCharacters="@string/alternates_for_k" /> + latin:moreKeys="@string/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:popupCharacters="@string/alternates_for_l" /> + latin:moreKeys="@string/more_keys_for_l" /> <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-15.704%p" diff --git a/java/res/xml-sw768dp/kbd_qwerty_row3.xml b/java/res/xml-sw768dp/kbd_qwerty_row3.xml index 677235f63..f2f137ea9 100644 --- a/java/res/xml-sw768dp/kbd_qwerty_row3.xml +++ b/java/res/xml-sw768dp/kbd_qwerty_row3.xml @@ -29,20 +29,20 @@ latin:keyWidth="13.829%p"/> <Key latin:keyLabel="z" - latin:popupCharacters="@string/alternates_for_z" /> + latin:moreKeys="@string/more_keys_for_z" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupCharacters="@string/alternates_for_c" /> + latin:moreKeys="@string/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:popupCharacters="@string/alternates_for_v" /> + latin:moreKeys="@string/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupCharacters="@string/alternates_for_n" /> + latin:moreKeys="@string/more_keys_for_n" /> <Key latin:keyLabel="m" /> <include diff --git a/java/res/xml-sw768dp/kbd_qwerty_row4.xml b/java/res/xml-sw768dp/kbd_qwerty_row4.xml index 1ff9d81f1..9346111ee 100644 --- a/java/res/xml-sw768dp/kbd_qwerty_row4.xml +++ b/java/res/xml-sw768dp/kbd_qwerty_row4.xml @@ -59,7 +59,7 @@ latin:keyLabel=":" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="+" - latin:popupCharacters="+" /> + latin:moreKeys="+" /> </case> <default> <Key @@ -78,7 +78,7 @@ latin:keyLabel="/" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="\@" - latin:popupCharacters="\@" /> + latin:moreKeys="\@" /> </default> </switch> </default> diff --git a/java/res/xml-sw768dp/kbd_row3_comma_period.xml b/java/res/xml-sw768dp/kbd_row3_comma_period.xml index 25453160f..b84443078 100644 --- a/java/res/xml-sw768dp/kbd_row3_comma_period.xml +++ b/java/res/xml-sw768dp/kbd_row3_comma_period.xml @@ -35,12 +35,12 @@ latin:keyLabel="," latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="!" - latin:popupCharacters="!" /> + latin:moreKeys="!" /> <Key latin:keyLabel="." latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="\?" - latin:popupCharacters="\?" /> + latin:moreKeys="\?" /> </default> </switch> </merge> diff --git a/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml b/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml index 50d4d4b10..9536e81da 100644 --- a/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml +++ b/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml @@ -35,14 +35,14 @@ latin:keyLabel="/" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel=":" - latin:popupCharacters=":" /> + latin:moreKeys=":" /> </case> <default> <Key latin:keyLabel="@string/keylabel_for_apostrophe" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="@string/keyhintlabel_for_apostrophe" - latin:popupCharacters="@string/alternates_for_apostrophe" /> + latin:moreKeys="@string/more_keys_for_apostrophe" /> </default> </switch> <switch> @@ -57,7 +57,7 @@ latin:keyLabel="@string/keylabel_for_dash" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="@string/keyhintlabel_for_dash" - latin:popupCharacters="@string/alternates_for_dash" /> + latin:moreKeys="@string/more_keys_for_dash" /> </default> </switch> </merge> diff --git a/java/res/xml-sw768dp/kbd_rows_arabic.xml b/java/res/xml-sw768dp/kbd_rows_arabic.xml index 2f10d54e8..984ba5092 100644 --- a/java/res/xml-sw768dp/kbd_rows_arabic.xml +++ b/java/res/xml-sw768dp/kbd_rows_arabic.xml @@ -40,7 +40,7 @@ latin:keyLabel="ق" /> <Key latin:keyLabel="ف" - latin:popupCharacters="ڤ" /> + latin:moreKeys="ڤ" /> <Key latin:keyLabel="غ" /> <Key @@ -49,14 +49,14 @@ \u0647\u0640: ARABIC LETTER HEH + ARABIC TATWEEL --> <Key latin:keyLabel="ه" - latin:popupCharacters="\ufeeb|\u0647\u0640" /> + latin:moreKeys="\ufeeb|\u0647\u0640" /> <Key latin:keyLabel="خ" /> <Key latin:keyLabel="ح" /> <Key latin:keyLabel="ج" - latin:popupCharacters="چ" /> + latin:moreKeys="چ" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-11.500%p" @@ -77,7 +77,7 @@ latin:keyLabel="ي" /> <Key latin:keyLabel="ب" - latin:popupCharacters="پ" /> + latin:moreKeys="پ" /> <!-- \ufefb: ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM \u0644: ARABIC LETTER LAM \u0627: ARABIC LETTER ALEF @@ -89,13 +89,13 @@ \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE --> <Key latin:keyLabel="ل" - latin:popupCharacters="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" /> + latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" /> <!-- \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE --> <Key latin:keyLabel="ا" - latin:popupCharacters="\u0623,\u0625,\u0622" /> + latin:moreKeys="\u0623,\u0625,\u0622" /> <Key latin:keyLabel="ت" /> <Key @@ -104,7 +104,7 @@ latin:keyLabel="م" /> <Key latin:keyLabel="ك" - latin:popupCharacters="گ" /> + latin:moreKeys="گ" /> <Key latin:keyLabel="ط" /> <Key @@ -134,7 +134,7 @@ latin:keyLabel="و" /> <Key latin:keyLabel="ز" - latin:popupCharacters="ژ" /> + latin:moreKeys="ژ" /> <Key latin:keyLabel="ظ" /> <Key diff --git a/java/res/xml-sw768dp/kbd_rows_azerty.xml b/java/res/xml-sw768dp/kbd_rows_azerty.xml index 7aec0d15d..4659d9924 100644 --- a/java/res/xml-sw768dp/kbd_rows_azerty.xml +++ b/java/res/xml-sw768dp/kbd_rows_azerty.xml @@ -32,34 +32,34 @@ latin:keyWidth="7.969%p" /> <Key latin:keyLabel="a" - latin:popupCharacters="@string/alternates_for_a" /> + latin:moreKeys="@string/more_keys_for_a" /> <Key latin:keyLabel="z" - latin:popupCharacters="@string/alternates_for_z" /> + latin:moreKeys="@string/more_keys_for_z" /> <Key latin:keyLabel="e" - latin:popupCharacters="@string/alternates_for_e" /> + latin:moreKeys="@string/more_keys_for_e" /> <Key latin:keyLabel="r" - latin:popupCharacters="@string/alternates_for_r" /> + latin:moreKeys="@string/more_keys_for_r" /> <Key latin:keyLabel="t" - latin:popupCharacters="@string/alternates_for_t" /> + latin:moreKeys="@string/more_keys_for_t" /> <Key latin:keyLabel="y" - latin:popupCharacters="@string/alternates_for_y" /> + latin:moreKeys="@string/more_keys_for_y" /> <Key latin:keyLabel="u" - latin:popupCharacters="@string/alternates_for_u" /> + latin:moreKeys="@string/more_keys_for_u" /> <Key latin:keyLabel="i" - latin:popupCharacters="@string/alternates_for_i" /> + latin:moreKeys="@string/more_keys_for_i" /> <Key latin:keyLabel="o" - latin:popupCharacters="@string/alternates_for_o" /> + latin:moreKeys="@string/more_keys_for_o" /> <Key latin:keyLabel="p" - latin:popupCharacters="@string/alternates_for_p" /> + latin:moreKeys="@string/more_keys_for_p" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-9.219%p" @@ -74,28 +74,28 @@ latin:keyWidth="10.167%p" /> <Key latin:keyLabel="q" - latin:popupCharacters="@string/alternates_for_q" /> + latin:moreKeys="@string/more_keys_for_q" /> <Key latin:keyLabel="s" - latin:popupCharacters="@string/alternates_for_s" /> + latin:moreKeys="@string/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:popupCharacters="@string/alternates_for_d" /> + latin:moreKeys="@string/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupCharacters="@string/alternates_for_g" /> + latin:moreKeys="@string/more_keys_for_g" /> <Key latin:keyLabel="h" /> <Key latin:keyLabel="j" /> <Key latin:keyLabel="k" - latin:popupCharacters="@string/alternates_for_k" /> + latin:moreKeys="@string/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:popupCharacters="@string/alternates_for_l" /> + latin:moreKeys="@string/more_keys_for_l" /> <Key latin:keyLabel="m" /> <Key @@ -111,25 +111,25 @@ latin:keyWidth="13.829%p" /> <Key latin:keyLabel="w" - latin:popupCharacters="@string/alternates_for_w" /> + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupCharacters="@string/alternates_for_c" /> + latin:moreKeys="@string/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:popupCharacters="@string/alternates_for_v" /> + latin:moreKeys="@string/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupCharacters="@string/alternates_for_n" /> + latin:moreKeys="@string/more_keys_for_n" /> <Key latin:keyLabel="\'" latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel=":" - latin:popupCharacters=":" /> + latin:moreKeys=":" /> <switch> <case latin:mode="email" @@ -144,12 +144,12 @@ latin:keyLabel="," latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="!" - latin:popupCharacters="!" /> + latin:moreKeys="!" /> <Key latin:keyLabel="." latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="\?" - latin:popupCharacters="\?" /> + latin:moreKeys="\?" /> </default> </switch> <Key diff --git a/java/res/xml-sw768dp/kbd_rows_hebrew.xml b/java/res/xml-sw768dp/kbd_rows_hebrew.xml index bacc6a13b..27b39d1ae 100644 --- a/java/res/xml-sw768dp/kbd_rows_hebrew.xml +++ b/java/res/xml-sw768dp/kbd_rows_hebrew.xml @@ -66,17 +66,17 @@ latin:keyLabel="ד" /> <Key latin:keyLabel="ג" - latin:popupCharacters="ג׳" /> + latin:moreKeys="ג׳" /> <Key latin:keyLabel="כ" /> <Key latin:keyLabel="ע" /> <Key latin:keyLabel="י" - latin:popupCharacters="ײַ" /> + latin:moreKeys="ײַ" /> <Key latin:keyLabel="ח" - latin:popupCharacters="ח׳" /> + latin:moreKeys="ח׳" /> <Key latin:keyLabel="ל" /> <Key @@ -89,7 +89,7 @@ > <Key latin:keyLabel="ז" - latin:popupCharacters="ז׳" + latin:moreKeys="ז׳" latin:keyXPos="13.829%p" /> <Key latin:keyLabel="ס" /> @@ -103,13 +103,13 @@ latin:keyLabel="מ" /> <Key latin:keyLabel="צ" - latin:popupCharacters="צ׳" /> + latin:moreKeys="צ׳" /> <Key latin:keyLabel="ת" - latin:popupCharacters="ת׳" /> + latin:moreKeys="ת׳" /> <Key latin:keyLabel="ץ" - latin:popupCharacters="ץ׳" /> + latin:moreKeys="ץ׳" /> <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-10.400%p" diff --git a/java/res/xml-sw768dp/kbd_rows_qwertz.xml b/java/res/xml-sw768dp/kbd_rows_qwertz.xml index 5556d1f3d..82e0dd09c 100644 --- a/java/res/xml-sw768dp/kbd_rows_qwertz.xml +++ b/java/res/xml-sw768dp/kbd_rows_qwertz.xml @@ -32,34 +32,34 @@ latin:keyWidth="7.969%p" /> <Key latin:keyLabel="q" - latin:popupCharacters="@string/alternates_for_q" /> + latin:moreKeys="@string/more_keys_for_q" /> <Key latin:keyLabel="w" - latin:popupCharacters="@string/alternates_for_w" /> + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="e" - latin:popupCharacters="@string/alternates_for_e" /> + latin:moreKeys="@string/more_keys_for_e" /> <Key latin:keyLabel="r" - latin:popupCharacters="@string/alternates_for_r" /> + latin:moreKeys="@string/more_keys_for_r" /> <Key latin:keyLabel="t" - latin:popupCharacters="@string/alternates_for_t" /> + latin:moreKeys="@string/more_keys_for_t" /> <Key latin:keyLabel="z" - latin:popupCharacters="@string/alternates_for_z" /> + latin:moreKeys="@string/more_keys_for_z" /> <Key latin:keyLabel="u" - latin:popupCharacters="@string/alternates_for_u" /> + latin:moreKeys="@string/more_keys_for_u" /> <Key latin:keyLabel="i" - latin:popupCharacters="@string/alternates_for_i" /> + latin:moreKeys="@string/more_keys_for_i" /> <Key latin:keyLabel="o" - latin:popupCharacters="@string/alternates_for_o" /> + latin:moreKeys="@string/more_keys_for_o" /> <Key latin:keyLabel="p" - latin:popupCharacters="@string/alternates_for_p" /> + latin:moreKeys="@string/more_keys_for_p" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-9.219%p" @@ -75,20 +75,20 @@ latin:keyWidth="13.829%p" /> <Key latin:keyLabel="y" - latin:popupCharacters="@string/alternates_for_y" /> + latin:moreKeys="@string/more_keys_for_y" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupCharacters="@string/alternates_for_c" /> + latin:moreKeys="@string/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:popupCharacters="@string/alternates_for_v" /> + latin:moreKeys="@string/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupCharacters="@string/alternates_for_n" /> + latin:moreKeys="@string/more_keys_for_n" /> <Key latin:keyLabel="m" /> <switch> @@ -105,12 +105,12 @@ latin:keyLabel="," latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="!" - latin:popupCharacters="!" /> + latin:moreKeys="!" /> <Key latin:keyLabel="." latin:keyLabelOption="hasUppercaseLetter" latin:keyHintLabel="\?" - latin:popupCharacters="\?" /> + latin:moreKeys="\?" /> </default> </switch> <Key diff --git a/java/res/xml-sw768dp/kbd_rows_russian.xml b/java/res/xml-sw768dp/kbd_rows_russian.xml index 82ceaeadc..e5f556958 100644 --- a/java/res/xml-sw768dp/kbd_rows_russian.xml +++ b/java/res/xml-sw768dp/kbd_rows_russian.xml @@ -39,7 +39,7 @@ latin:keyLabel="к" /> <Key latin:keyLabel="е" - latin:popupCharacters="@string/alternates_for_cyrillic_e" /> + latin:moreKeys="@string/more_keys_for_cyrillic_e" /> <Key latin:keyLabel="н" /> <Key diff --git a/java/res/xml-sw768dp/kbd_rows_scandinavian.xml b/java/res/xml-sw768dp/kbd_rows_scandinavian.xml index 743c6bd26..b9d168036 100644 --- a/java/res/xml-sw768dp/kbd_rows_scandinavian.xml +++ b/java/res/xml-sw768dp/kbd_rows_scandinavian.xml @@ -32,34 +32,34 @@ latin:keyWidth="7.500%p" /> <Key latin:keyLabel="q" - latin:popupCharacters="@string/alternates_for_q" /> + latin:moreKeys="@string/more_keys_for_q" /> <Key latin:keyLabel="w" - latin:popupCharacters="@string/alternates_for_w" /> + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="e" - latin:popupCharacters="@string/alternates_for_e" /> + latin:moreKeys="@string/more_keys_for_e" /> <Key latin:keyLabel="r" - latin:popupCharacters="@string/alternates_for_r" /> + latin:moreKeys="@string/more_keys_for_r" /> <Key latin:keyLabel="t" - latin:popupCharacters="@string/alternates_for_t" /> + latin:moreKeys="@string/more_keys_for_t" /> <Key latin:keyLabel="y" - latin:popupCharacters="@string/alternates_for_y" /> + latin:moreKeys="@string/more_keys_for_y" /> <Key latin:keyLabel="u" - latin:popupCharacters="@string/alternates_for_u" /> + latin:moreKeys="@string/more_keys_for_u" /> <Key latin:keyLabel="i" - latin:popupCharacters="@string/alternates_for_i" /> + latin:moreKeys="@string/more_keys_for_i" /> <Key latin:keyLabel="o" - latin:popupCharacters="@string/alternates_for_o" /> + latin:moreKeys="@string/more_keys_for_o" /> <Key latin:keyLabel="p" - latin:popupCharacters="@string/alternates_for_p" /> + latin:moreKeys="@string/more_keys_for_p" /> <Key latin:keyLabel="å" /> <Key @@ -76,34 +76,34 @@ latin:keyWidth="9.375%p" /> <Key latin:keyLabel="a" - latin:popupCharacters="@string/alternates_for_a" /> + latin:moreKeys="@string/more_keys_for_a" /> <Key latin:keyLabel="s" - latin:popupCharacters="@string/alternates_for_s" /> + latin:moreKeys="@string/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:popupCharacters="@string/alternates_for_d" /> + latin:moreKeys="@string/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupCharacters="@string/alternates_for_g" /> + latin:moreKeys="@string/more_keys_for_g" /> <Key latin:keyLabel="h" /> <Key latin:keyLabel="j" /> <Key latin:keyLabel="k" - latin:popupCharacters="@string/alternates_for_k" /> + latin:moreKeys="@string/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:popupCharacters="@string/alternates_for_l" /> + latin:moreKeys="@string/more_keys_for_l" /> <Key latin:keyLabel="@string/keylabel_for_scandinavia_row2_10" - latin:popupCharacters="@string/alternates_for_scandinavia_row2_10" /> + latin:moreKeys="@string/more_keys_for_scandinavia_row2_10" /> <Key latin:keyLabel="@string/keylabel_for_scandinavia_row2_11" - latin:popupCharacters="@string/alternates_for_scandinavia_row2_11" /> + latin:moreKeys="@string/more_keys_for_scandinavia_row2_11" /> <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-9.375%p" @@ -117,20 +117,20 @@ latin:keyWidth="12.750%p" /> <Key latin:keyLabel="z" - latin:popupCharacters="@string/alternates_for_z" /> + latin:moreKeys="@string/more_keys_for_z" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupCharacters="@string/alternates_for_c" /> + latin:moreKeys="@string/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:popupCharacters="@string/alternates_for_v" /> + latin:moreKeys="@string/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupCharacters="@string/alternates_for_n" /> + latin:moreKeys="@string/more_keys_for_n" /> <Key latin:keyLabel="m" /> <include diff --git a/java/res/xml-sw768dp/kbd_rows_spanish.xml b/java/res/xml-sw768dp/kbd_rows_spanish.xml index 510cafbfd..c737f400a 100644 --- a/java/res/xml-sw768dp/kbd_rows_spanish.xml +++ b/java/res/xml-sw768dp/kbd_rows_spanish.xml @@ -34,28 +34,28 @@ latin:keyWidth="10.167%p" /> <Key latin:keyLabel="a" - latin:popupCharacters="@string/alternates_for_a" /> + latin:moreKeys="@string/more_keys_for_a" /> <Key latin:keyLabel="s" - latin:popupCharacters="@string/alternates_for_s" /> + latin:moreKeys="@string/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:popupCharacters="@string/alternates_for_d" /> + latin:moreKeys="@string/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupCharacters="@string/alternates_for_g" /> + latin:moreKeys="@string/more_keys_for_g" /> <Key latin:keyLabel="h" /> <Key latin:keyLabel="j" /> <Key latin:keyLabel="k" - latin:popupCharacters="@string/alternates_for_k" /> + latin:moreKeys="@string/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:popupCharacters="@string/alternates_for_l" /> + latin:moreKeys="@string/more_keys_for_l" /> <Key latin:keyLabel="ñ" /> <Key diff --git a/java/res/xml-sw768dp/kbd_rows_symbols.xml b/java/res/xml-sw768dp/kbd_rows_symbols.xml index 66b9789ac..fd18a2a76 100644 --- a/java/res/xml-sw768dp/kbd_rows_symbols.xml +++ b/java/res/xml-sw768dp/kbd_rows_symbols.xml @@ -34,34 +34,34 @@ latin:keyWidth="7.969%p" /> <Key latin:keyLabel="@string/keylabel_for_symbols_1" - latin:popupCharacters="@string/alternates_for_symbols_1" /> + latin:moreKeys="@string/more_keys_for_symbols_1" /> <Key latin:keyLabel="@string/keylabel_for_symbols_2" - latin:popupCharacters="@string/alternates_for_symbols_2" /> + latin:moreKeys="@string/more_keys_for_symbols_2" /> <Key latin:keyLabel="@string/keylabel_for_symbols_3" - latin:popupCharacters="@string/alternates_for_symbols_3" /> + latin:moreKeys="@string/more_keys_for_symbols_3" /> <Key latin:keyLabel="@string/keylabel_for_symbols_4" - latin:popupCharacters="@string/alternates_for_symbols_4" /> + latin:moreKeys="@string/more_keys_for_symbols_4" /> <Key latin:keyLabel="@string/keylabel_for_symbols_5" - latin:popupCharacters="@string/alternates_for_symbols_5" /> + latin:moreKeys="@string/more_keys_for_symbols_5" /> <Key latin:keyLabel="@string/keylabel_for_symbols_6" - latin:popupCharacters="@string/alternates_for_symbols_6" /> + latin:moreKeys="@string/more_keys_for_symbols_6" /> <Key latin:keyLabel="@string/keylabel_for_symbols_7" - latin:popupCharacters="@string/alternates_for_symbols_7" /> + latin:moreKeys="@string/more_keys_for_symbols_7" /> <Key latin:keyLabel="@string/keylabel_for_symbols_8" - latin:popupCharacters="@string/alternates_for_symbols_8" /> + latin:moreKeys="@string/more_keys_for_symbols_8" /> <Key latin:keyLabel="@string/keylabel_for_symbols_9" - latin:popupCharacters="@string/alternates_for_symbols_9" /> + latin:moreKeys="@string/more_keys_for_symbols_9" /> <Key latin:keyLabel="@string/keylabel_for_symbols_0" - latin:popupCharacters="@string/alternates_for_symbols_0" /> + latin:moreKeys="@string/more_keys_for_symbols_0" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-9.219%p" @@ -80,24 +80,24 @@ latin:keyStyle="currencyKeyStyle" /> <Key latin:keyLabel="@string/keylabel_for_symbols_percent" - latin:popupCharacters="@string/alternates_for_symbols_percent" /> + latin:moreKeys="@string/more_keys_for_symbols_percent" /> <Key latin:keyLabel="&" /> <Key latin:keyLabel="*" - latin:popupCharacters="†,‡,★" /> + latin:moreKeys="†,‡,★" /> <Key latin:keyLabel="-" - latin:popupCharacters="_,–,—" /> + latin:moreKeys="_,–,—" /> <Key latin:keyLabel="+" - latin:popupCharacters="±" /> + latin:moreKeys="±" /> <Key latin:keyLabel="(" - latin:popupCharacters="[,{,<" /> + latin:moreKeys="[,{,<" /> <Key latin:keyLabel=")" - latin:popupCharacters="],},>" /> + latin:moreKeys="],},>" /> <Key latin:keyStyle="returnKeyStyle" latin:keyXPos="-15.704%p" @@ -111,20 +111,20 @@ latin:keyWidth="13.829%p" /> <Key latin:keyLabel="<" - latin:popupCharacters="≤,«,‹" /> + latin:moreKeys="≤,«,‹" /> <Key latin:keyLabel=">" - latin:popupCharacters="≥,»,›" /> + latin:moreKeys="≥,»,›" /> <Key latin:keyLabel="=" - latin:popupCharacters="≠,≈" /> + latin:moreKeys="≠,≈" /> <switch> <case latin:mode="url" > <Key latin:keyLabel="\'" - latin:popupCharacters="‘,’,‚,‛" /> + latin:moreKeys="‘,’,‚,‛" /> </case> <default> <Key @@ -133,18 +133,18 @@ </switch> <Key latin:keyLabel="@string/keylabel_for_symbols_semicolon" - latin:popupCharacters="@string/alternates_for_symbols_semicolon" /> + latin:moreKeys="@string/more_keys_for_symbols_semicolon" /> <Key latin:keyLabel="@string/keylabel_for_comma" - latin:popupCharacters="@string/alternates_for_comma" /> + latin:moreKeys="@string/more_keys_for_comma" /> <Key latin:keyLabel="." /> <Key latin:keyLabel="!" - latin:popupCharacters="¡" /> + latin:moreKeys="¡" /> <Key latin:keyLabel="@string/keylabel_for_symbols_question" - latin:popupCharacters="@string/alternates_for_symbols_question" /> + latin:moreKeys="@string/more_keys_for_symbols_question" /> <Key latin:keyStyle="toMoreSymbolKeyStyle" latin:keyXPos="-13.750%p" @@ -172,10 +172,10 @@ latin:keyXPos="31.250%p" latin:keyWidth="37.500%p" /> <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. --> - <!-- latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛" --> + <!-- latin:moreKeys="“,”,„,‟,«,»,‘,’,‚,‛" --> <Key latin:keyLabel=""" - latin:popupCharacters="“,”,«,»,‘,’,‚,‛" /> + latin:moreKeys="“,”,«,»,‘,’,‚,‛" /> <Key latin:keyLabel="_" /> <switch> diff --git a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml index 82bc4b26e..30f72ac46 100644 --- a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml +++ b/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml @@ -38,19 +38,19 @@ latin:keyLabel="|" /> <Key latin:keyLabel="•" - latin:popupCharacters="♪,♥,♠,♦,♣" /> + latin:moreKeys="♪,♥,♠,♦,♣" /> <Key latin:keyLabel="√" /> <Key latin:keyLabel="π" - latin:popupCharacters="Π" /> + latin:moreKeys="Π" /> <Key latin:keyLabel="÷" /> <Key latin:keyLabel="×" /> <Key latin:keyLabel="§" - latin:popupCharacters="¶" /> + latin:moreKeys="¶" /> <Key latin:keyLabel="Δ" /> <Key @@ -75,13 +75,13 @@ latin:keyLabel="¥" /> <Key latin:keyLabel="^" - latin:popupCharacters="↑,↓,←,→" /> + latin:moreKeys="↑,↓,←,→" /> <Key latin:keyLabel="°" - latin:popupCharacters="′,″" /> + latin:moreKeys="′,″" /> <Key latin:keyLabel="±" - latin:popupCharacters="∞" /> + latin:moreKeys="∞" /> <Key latin:keyLabel="{" /> <Key diff --git a/java/res/xml/kbd_currency_key_styles.xml b/java/res/xml/kbd_currency_key_styles.xml index d2c711766..bcdfe5639 100644 --- a/java/res/xml/kbd_currency_key_styles.xml +++ b/java/res/xml/kbd_currency_key_styles.xml @@ -62,7 +62,7 @@ <key-style latin:styleName="currencyKeyStyle" latin:keyLabel="€" - latin:popupCharacters="@string/alternates_for_currency_euro" /> + latin:moreKeys="@string/more_keys_for_currency_euro" /> </case> <case latin:languageCode="ca|et|lb|mt|sla" @@ -70,7 +70,7 @@ <key-style latin:styleName="currencyKeyStyle" latin:keyLabel="€" - latin:popupCharacters="@string/alternates_for_currency_euro" /> + latin:moreKeys="@string/more_keys_for_currency_euro" /> </case> <case latin:countryCode="AD|AT|BE|CY|EE|FI|FR|DE|GR|IE|IT|XK|LU|MT|MO|ME|NL|PT|SM|SK|SI|ES|VA" @@ -78,7 +78,7 @@ <key-style latin:styleName="currencyKeyStyle" latin:keyLabel="€" - latin:popupCharacters="@string/alternates_for_currency_euro" /> + latin:moreKeys="@string/more_keys_for_currency_euro" /> </case> <case latin:languageCode="iw" @@ -86,7 +86,7 @@ <key-style latin:styleName="currencyKeyStyle" latin:keyLabel="₪" - latin:popupCharacters="@string/alternates_for_currency_general" /> + latin:moreKeys="@string/more_keys_for_currency_general" /> </case> <!-- United Kingdom --> <case @@ -95,13 +95,13 @@ <key-style latin:styleName="currencyKeyStyle" latin:keyLabel="£" - latin:popupCharacters="@string/alternates_for_currency_pound" /> + latin:moreKeys="@string/more_keys_for_currency_pound" /> </case> <default> <key-style latin:styleName="currencyKeyStyle" latin:keyLabel="$" - latin:popupCharacters="@string/alternates_for_currency_dollar" /> + latin:moreKeys="@string/more_keys_for_currency_dollar" /> </default> </switch> </merge> diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml index 86f0bf24b..12eab22b9 100644 --- a/java/res/xml/kbd_key_styles.xml +++ b/java/res/xml/kbd_key_styles.xml @@ -33,7 +33,7 @@ <key-style latin:styleName="f1PopupStyle" latin:keyLabelOption="hasPopupHint" - latin:popupCharacters="@string/alternates_for_f1" + latin:moreKeys="@string/more_keys_for_f1" latin:parentStyle="functionalKeyStyle" /> </case> <!-- clobberSettingsKey="false --> @@ -43,7 +43,7 @@ <key-style latin:styleName="f1PopupStyle" latin:keyLabelOption="hasPopupHint" - latin:popupCharacters="@string/alternates_for_f1_settings" + latin:moreKeys="@string/more_keys_for_f1_settings" latin:parentStyle="functionalKeyStyle" /> </case> <!-- clobberSettingsKey="false" hasSettingsKey="true" --> @@ -53,7 +53,7 @@ <key-style latin:styleName="f1PopupStyle" latin:keyLabelOption="hasPopupHint" - latin:popupCharacters="@string/alternates_for_f1_navigate" + latin:moreKeys="@string/more_keys_for_f1_navigate" latin:parentStyle="functionalKeyStyle" /> </case> <!-- clobberSettingsKey="false" and hasSettingsKey="true" navigateAction="false" --> @@ -61,7 +61,7 @@ <key-style latin:styleName="f1PopupStyle" latin:keyLabelOption="hasPopupHint" - latin:popupCharacters="@string/alternates_for_f1" + latin:moreKeys="@string/more_keys_for_f1" latin:parentStyle="functionalKeyStyle" /> </default> </switch> @@ -90,8 +90,8 @@ latin:keyLabel=":-)" latin:keyOutputText=":-) " latin:keyLabelOption="hasPopupHint" - latin:popupCharacters="@string/alternates_for_smiley" - latin:maxMiniKeyboardColumn="5" + latin:moreKeys="@string/more_keys_for_smiley" + latin:maxMoreKeysColumn="5" latin:parentStyle="functionalKeyStyle" /> </case> <case @@ -220,7 +220,7 @@ latin:keyLabel="." latin:keyHintLabel="@string/keyhintlabel_for_punctuation" latin:keyLabelOption="hasPopupHint" - latin:popupCharacters="@string/alternates_for_punctuation" - latin:maxMiniKeyboardColumn="@integer/mini_keyboard_column_for_punctuation" + latin:moreKeys="@string/more_keys_for_punctuation" + latin:maxMoreKeysColumn="@integer/mini_keyboard_column_for_punctuation" latin:parentStyle="functionalKeyStyle" /> </merge> diff --git a/java/res/xml/kbd_mini_keyboard_template.xml b/java/res/xml/kbd_mini_keyboard_template.xml index 79db081a1..d25878b48 100644 --- a/java/res/xml/kbd_mini_keyboard_template.xml +++ b/java/res/xml/kbd_mini_keyboard_template.xml @@ -20,8 +20,6 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:keyWidth="10%p" - latin:horizontalGap="@fraction/key_horizontal_gap" - latin:verticalGap="0px" latin:rowHeight="@dimen/popup_key_height" > </Keyboard> diff --git a/java/res/xml/kbd_qwerty_row1.xml b/java/res/xml/kbd_qwerty_row1.xml index daa138255..e8e8d1b46 100644 --- a/java/res/xml/kbd_qwerty_row1.xml +++ b/java/res/xml/kbd_qwerty_row1.xml @@ -27,43 +27,43 @@ <Key latin:keyLabel="q" latin:keyHintLabel="1" - latin:popupCharacters="@string/alternates_for_q" /> + latin:moreKeys="@string/more_keys_for_q" /> <Key latin:keyLabel="w" latin:keyHintLabel="2" - latin:popupCharacters="@string/alternates_for_w" /> + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="e" latin:keyHintLabel="3" - latin:popupCharacters="@string/alternates_for_e" /> + latin:moreKeys="@string/more_keys_for_e" /> <Key latin:keyLabel="r" latin:keyHintLabel="4" - latin:popupCharacters="@string/alternates_for_r" /> + latin:moreKeys="@string/more_keys_for_r" /> <Key latin:keyLabel="t" latin:keyHintLabel="5" - latin:popupCharacters="@string/alternates_for_t" /> + latin:moreKeys="@string/more_keys_for_t" /> <Key latin:keyLabel="y" latin:keyHintLabel="6" - latin:popupCharacters="@string/alternates_for_y" /> + latin:moreKeys="@string/more_keys_for_y" /> <Key latin:keyLabel="u" latin:keyHintLabel="7" - latin:popupCharacters="@string/alternates_for_u" /> + latin:moreKeys="@string/more_keys_for_u" /> <Key latin:keyLabel="i" latin:keyHintLabel="8" - latin:popupCharacters="@string/alternates_for_i" /> + latin:moreKeys="@string/more_keys_for_i" /> <Key latin:keyLabel="o" latin:keyHintLabel="9" - latin:popupCharacters="@string/alternates_for_o" /> + latin:moreKeys="@string/more_keys_for_o" /> <Key latin:keyLabel="p" latin:keyHintLabel="0" - latin:popupCharacters="@string/alternates_for_p" + latin:moreKeys="@string/more_keys_for_p" latin:keyWidth="fillRight" /> </Row> </merge> diff --git a/java/res/xml/kbd_qwerty_row2.xml b/java/res/xml/kbd_qwerty_row2.xml index 6e4872e08..8986780b7 100644 --- a/java/res/xml/kbd_qwerty_row2.xml +++ b/java/res/xml/kbd_qwerty_row2.xml @@ -26,29 +26,29 @@ > <Key latin:keyLabel="a" - latin:popupCharacters="@string/alternates_for_a" + latin:moreKeys="@string/more_keys_for_a" latin:keyXPos="5%p" /> <Key latin:keyLabel="s" - latin:popupCharacters="@string/alternates_for_s" /> + latin:moreKeys="@string/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:popupCharacters="@string/alternates_for_d" /> + latin:moreKeys="@string/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupCharacters="@string/alternates_for_g" /> + latin:moreKeys="@string/more_keys_for_g" /> <Key latin:keyLabel="h" /> <Key latin:keyLabel="j" /> <Key latin:keyLabel="k" - latin:popupCharacters="@string/alternates_for_k" /> + latin:moreKeys="@string/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:popupCharacters="@string/alternates_for_l" /> + latin:moreKeys="@string/more_keys_for_l" /> <!-- Here is 5%p space --> </Row> </merge> diff --git a/java/res/xml/kbd_qwerty_row3.xml b/java/res/xml/kbd_qwerty_row3.xml index 6a2035543..c2b45e752 100644 --- a/java/res/xml/kbd_qwerty_row3.xml +++ b/java/res/xml/kbd_qwerty_row3.xml @@ -30,20 +30,20 @@ latin:visualInsetsRight="1%p" /> <Key latin:keyLabel="z" - latin:popupCharacters="@string/alternates_for_z" /> + latin:moreKeys="@string/more_keys_for_z" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupCharacters="@string/alternates_for_c" /> + latin:moreKeys="@string/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:popupCharacters="@string/alternates_for_v" /> + latin:moreKeys="@string/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupCharacters="@string/alternates_for_n" /> + latin:moreKeys="@string/more_keys_for_n" /> <Key latin:keyLabel="m" /> <Key diff --git a/java/res/xml/kbd_rows_arabic.xml b/java/res/xml/kbd_rows_arabic.xml index daa2a65ed..569ac7ef9 100644 --- a/java/res/xml/kbd_rows_arabic.xml +++ b/java/res/xml/kbd_rows_arabic.xml @@ -29,47 +29,47 @@ <Key latin:keyLabel="ض" latin:keyHintLabel="1" - latin:popupCharacters="1,١" /> + latin:moreKeys="1,١" /> <Key latin:keyLabel="ص" latin:keyHintLabel="2" - latin:popupCharacters="2,٢" /> + latin:moreKeys="2,٢" /> <Key latin:keyLabel="ق" latin:keyHintLabel="3" - latin:popupCharacters="3,٣" /> + latin:moreKeys="3,٣" /> <!-- \u06a4: ARABIC LETTER VEH --> <Key latin:keyLabel="ف" latin:keyHintLabel="4" - latin:popupCharacters="4,٤,\u06a4" /> + latin:moreKeys="4,٤,\u06a4" /> <Key latin:keyLabel="غ" latin:keyHintLabel="5" - latin:popupCharacters="5,٥" /> + latin:moreKeys="5,٥" /> <Key latin:keyLabel="ع" latin:keyHintLabel="6" - latin:popupCharacters="6,٦" /> + latin:moreKeys="6,٦" /> <!-- \ufeeb: ARABIC LETTER HEH INITIAL FORM \u0647\u0640: ARABIC LETTER HEH + ARABIC TATWEEL --> <Key latin:keyLabel="ه" latin:keyHintLabel="7" - latin:popupCharacters="7,٧,\ufeeb|\u0647\u0640" /> + latin:moreKeys="7,٧,\ufeeb|\u0647\u0640" /> <Key latin:keyLabel="خ" latin:keyHintLabel="8" - latin:popupCharacters="8,٨" /> + latin:moreKeys="8,٨" /> <Key latin:keyLabel="ح" latin:keyHintLabel="9" - latin:popupCharacters="9,٩" /> + latin:moreKeys="9,٩" /> <!-- \u0686: ARABIC LETTER TCHEH --> <Key latin:keyLabel="ج" latin:keyHintLabel="0" - latin:popupCharacters="0,٠,\u0686" + latin:moreKeys="0,٠,\u0686" latin:keyWidth="fillRight" /> </Row> <Row @@ -83,10 +83,10 @@ \u0649: ARABIC LETTER ALEF MAKSURA --> <Key latin:keyLabel="ي" - latin:popupCharacters="\u0626,\u0649" /> + latin:moreKeys="\u0626,\u0649" /> <Key latin:keyLabel="ب" - latin:popupCharacters="پ" /> + latin:moreKeys="پ" /> <!-- \ufefb: ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM \u0644: ARABIC LETTER LAM \u0627: ARABIC LETTER ALEF @@ -98,24 +98,24 @@ \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE --> <Key latin:keyLabel="ل" - latin:popupCharacters="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" /> + latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" /> <!-- \u0621: ARABIC LETTER HAMZA \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE --> <Key latin:keyLabel="ا" - latin:popupCharacters="\u0621,\u0623,\u0625,\u0622" /> + latin:moreKeys="\u0621,\u0623,\u0625,\u0622" /> <Key latin:keyLabel="ت" - latin:popupCharacters="ث" /> + latin:moreKeys="ث" /> <Key latin:keyLabel="ن" /> <Key latin:keyLabel="م" /> <Key latin:keyLabel="ك" - latin:popupCharacters="گ" + latin:moreKeys="گ" latin:keyWidth="fillRight" /> </Row> <Row @@ -132,14 +132,14 @@ latin:keyLabel="د" /> <Key latin:keyLabel="ز" - latin:popupCharacters="ژ" /> + latin:moreKeys="ژ" /> <Key latin:keyLabel="ر" /> <Key latin:keyLabel="ة" /> <Key latin:keyLabel="و" - latin:popupCharacters="ؤ" /> + latin:moreKeys="ؤ" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" diff --git a/java/res/xml/kbd_rows_azerty.xml b/java/res/xml/kbd_rows_azerty.xml index dbf25eb95..54fe546e3 100644 --- a/java/res/xml/kbd_rows_azerty.xml +++ b/java/res/xml/kbd_rows_azerty.xml @@ -29,43 +29,43 @@ <Key latin:keyLabel="a" latin:keyHintLabel="1" - latin:popupCharacters="@string/alternates_for_a" /> + latin:moreKeys="@string/more_keys_for_a" /> <Key latin:keyLabel="z" latin:keyHintLabel="2" - latin:popupCharacters="@string/alternates_for_z" /> + latin:moreKeys="@string/more_keys_for_z" /> <Key latin:keyLabel="e" latin:keyHintLabel="3" - latin:popupCharacters="@string/alternates_for_e" /> + latin:moreKeys="@string/more_keys_for_e" /> <Key latin:keyLabel="r" latin:keyHintLabel="4" - latin:popupCharacters="@string/alternates_for_r" /> + latin:moreKeys="@string/more_keys_for_r" /> <Key latin:keyLabel="t" latin:keyHintLabel="5" - latin:popupCharacters="@string/alternates_for_t" /> + latin:moreKeys="@string/more_keys_for_t" /> <Key latin:keyLabel="y" latin:keyHintLabel="6" - latin:popupCharacters="@string/alternates_for_y" /> + latin:moreKeys="@string/more_keys_for_y" /> <Key latin:keyLabel="u" latin:keyHintLabel="7" - latin:popupCharacters="@string/alternates_for_u" /> + latin:moreKeys="@string/more_keys_for_u" /> <Key latin:keyLabel="i" latin:keyHintLabel="8" - latin:popupCharacters="@string/alternates_for_i" /> + latin:moreKeys="@string/more_keys_for_i" /> <Key latin:keyLabel="o" latin:keyHintLabel="9" - latin:popupCharacters="@string/alternates_for_o" /> + latin:moreKeys="@string/more_keys_for_o" /> <Key latin:keyLabel="p" latin:keyHintLabel="0" - latin:popupCharacters="@string/alternates_for_p" + latin:moreKeys="@string/more_keys_for_p" latin:keyWidth="fillRight" /> </Row> <Row @@ -73,28 +73,28 @@ > <Key latin:keyLabel="q" - latin:popupCharacters="@string/alternates_for_q" /> + latin:moreKeys="@string/more_keys_for_q" /> <Key latin:keyLabel="s" - latin:popupCharacters="@string/alternates_for_s" /> + latin:moreKeys="@string/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:popupCharacters="@string/alternates_for_d" /> + latin:moreKeys="@string/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupCharacters="@string/alternates_for_g" /> + latin:moreKeys="@string/more_keys_for_g" /> <Key latin:keyLabel="h" /> <Key latin:keyLabel="j" /> <Key latin:keyLabel="k" - latin:popupCharacters="@string/alternates_for_k" /> + latin:moreKeys="@string/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:popupCharacters="@string/alternates_for_l" /> + latin:moreKeys="@string/more_keys_for_l" /> <Key latin:keyLabel="m" latin:keyWidth="fillRight" /> @@ -108,24 +108,24 @@ latin:visualInsetsRight="1%p" /> <Key latin:keyLabel="w" - latin:popupCharacters="@string/alternates_for_w" /> + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupCharacters="@string/alternates_for_c" /> + latin:moreKeys="@string/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:popupCharacters="@string/alternates_for_v" /> + latin:moreKeys="@string/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupCharacters="@string/alternates_for_n" /> + latin:moreKeys="@string/more_keys_for_n" /> <Key latin:keyLabel="\'" - latin:popupCharacters="‘,’,‚,‛" /> + latin:moreKeys="‘,’,‚,‛" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" diff --git a/java/res/xml/kbd_rows_hebrew.xml b/java/res/xml/kbd_rows_hebrew.xml index 1ec076860..6be8174c5 100644 --- a/java/res/xml/kbd_rows_hebrew.xml +++ b/java/res/xml/kbd_rows_hebrew.xml @@ -57,17 +57,17 @@ latin:keyLabel="ד" /> <Key latin:keyLabel="ג" - latin:popupCharacters="ג׳" /> + latin:moreKeys="ג׳" /> <Key latin:keyLabel="כ" /> <Key latin:keyLabel="ע" /> <Key latin:keyLabel="י" - latin:popupCharacters="ײַ" /> + latin:moreKeys="ײַ" /> <Key latin:keyLabel="ח" - latin:popupCharacters="ח׳" /> + latin:moreKeys="ח׳" /> <Key latin:keyLabel="ל" /> <Key @@ -81,7 +81,7 @@ > <Key latin:keyLabel="ז" - latin:popupCharacters="ז׳" + latin:moreKeys="ז׳" latin:keyXPos="5%p" /> <Key latin:keyLabel="ס" /> @@ -95,13 +95,13 @@ latin:keyLabel="מ" /> <Key latin:keyLabel="צ" - latin:popupCharacters="צ׳" /> + latin:moreKeys="צ׳" /> <Key latin:keyLabel="ת" - latin:popupCharacters="ת׳" /> + latin:moreKeys="ת׳" /> <Key latin:keyLabel="ץ" - latin:popupCharacters="ץ׳" /> + latin:moreKeys="ץ׳" /> <!-- Here is 5%p space --> </Row> <include diff --git a/java/res/xml/kbd_rows_qwertz.xml b/java/res/xml/kbd_rows_qwertz.xml index f94892125..71bb601e6 100644 --- a/java/res/xml/kbd_rows_qwertz.xml +++ b/java/res/xml/kbd_rows_qwertz.xml @@ -29,43 +29,43 @@ <Key latin:keyLabel="q" latin:keyHintLabel="1" - latin:popupCharacters="@string/alternates_for_q" /> + latin:moreKeys="@string/more_keys_for_q" /> <Key latin:keyLabel="w" latin:keyHintLabel="2" - latin:popupCharacters="@string/alternates_for_w" /> + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="e" latin:keyHintLabel="3" - latin:popupCharacters="@string/alternates_for_e" /> + latin:moreKeys="@string/more_keys_for_e" /> <Key latin:keyLabel="r" latin:keyHintLabel="4" - latin:popupCharacters="@string/alternates_for_r" /> + latin:moreKeys="@string/more_keys_for_r" /> <Key latin:keyLabel="t" latin:keyHintLabel="5" - latin:popupCharacters="@string/alternates_for_t" /> + latin:moreKeys="@string/more_keys_for_t" /> <Key latin:keyLabel="z" latin:keyHintLabel="6" - latin:popupCharacters="@string/alternates_for_z" /> + latin:moreKeys="@string/more_keys_for_z" /> <Key latin:keyLabel="u" latin:keyHintLabel="7" - latin:popupCharacters="@string/alternates_for_u" /> + latin:moreKeys="@string/more_keys_for_u" /> <Key latin:keyLabel="i" latin:keyHintLabel="8" - latin:popupCharacters="@string/alternates_for_i" /> + latin:moreKeys="@string/more_keys_for_i" /> <Key latin:keyLabel="o" latin:keyHintLabel="9" - latin:popupCharacters="@string/alternates_for_o" /> + latin:moreKeys="@string/more_keys_for_o" /> <Key latin:keyLabel="p" latin:keyHintLabel="0" - latin:popupCharacters="@string/alternates_for_p" + latin:moreKeys="@string/more_keys_for_p" latin:keyWidth="fillRight" /> </Row> <include @@ -79,20 +79,20 @@ latin:visualInsetsRight="1%p" /> <Key latin:keyLabel="y" - latin:popupCharacters="@string/alternates_for_y" /> + latin:moreKeys="@string/more_keys_for_y" /> <Key latin:keyLabel="x" /> <Key latin:keyLabel="c" - latin:popupCharacters="@string/alternates_for_c" /> + latin:moreKeys="@string/more_keys_for_c" /> <Key latin:keyLabel="v" - latin:popupCharacters="@string/alternates_for_v" /> + latin:moreKeys="@string/more_keys_for_v" /> <Key latin:keyLabel="b" /> <Key latin:keyLabel="n" - latin:popupCharacters="@string/alternates_for_n" /> + latin:moreKeys="@string/more_keys_for_n" /> <Key latin:keyLabel="m" /> <Key diff --git a/java/res/xml/kbd_rows_russian.xml b/java/res/xml/kbd_rows_russian.xml index 0c7a23754..d6075d2e3 100644 --- a/java/res/xml/kbd_rows_russian.xml +++ b/java/res/xml/kbd_rows_russian.xml @@ -29,47 +29,47 @@ <Key latin:keyLabel="й" latin:keyHintLabel="1" - latin:popupCharacters="1" + latin:moreKeys="1" latin:keyWidth="8.75%p" /> <Key latin:keyLabel="ц" latin:keyHintLabel="2" - latin:popupCharacters="2" /> + latin:moreKeys="2" /> <Key latin:keyLabel="у" latin:keyHintLabel="3" - latin:popupCharacters="3" /> + latin:moreKeys="3" /> <Key latin:keyLabel="к" latin:keyHintLabel="4" - latin:popupCharacters="4" /> + latin:moreKeys="4" /> <Key latin:keyLabel="е" latin:keyHintLabel="5" - latin:popupCharacters="@string/alternates_for_cyrillic_e" /> + latin:moreKeys="@string/more_keys_for_cyrillic_e" /> <Key latin:keyLabel="н" latin:keyHintLabel="6" - latin:popupCharacters="6" /> + latin:moreKeys="6" /> <Key latin:keyLabel="г" latin:keyHintLabel="7" - latin:popupCharacters="7" /> + latin:moreKeys="7" /> <Key latin:keyLabel="ш" latin:keyHintLabel="8" - latin:popupCharacters="8" /> + latin:moreKeys="8" /> <Key latin:keyLabel="щ" latin:keyHintLabel="9" - latin:popupCharacters="9" /> + latin:moreKeys="9" /> <Key latin:keyLabel="з" latin:keyHintLabel="0" - latin:popupCharacters="0" /> + latin:moreKeys="0" /> <Key latin:keyLabel="х" - latin:popupCharacters="@string/alternates_for_cyrillic_ha" + latin:moreKeys="@string/more_keys_for_cyrillic_ha" latin:keyWidth="fillRight" /> </Row> <Row @@ -120,7 +120,7 @@ latin:keyLabel="т" /> <Key latin:keyLabel="ь" - latin:popupCharacters="@string/alternates_for_cyrillic_soft_sign" /> + latin:moreKeys="@string/more_keys_for_cyrillic_soft_sign" /> <Key latin:keyLabel="б" /> <Key diff --git a/java/res/xml/kbd_rows_scandinavian.xml b/java/res/xml/kbd_rows_scandinavian.xml index 7e8902e0b..6ef54ebba 100644 --- a/java/res/xml/kbd_rows_scandinavian.xml +++ b/java/res/xml/kbd_rows_scandinavian.xml @@ -29,44 +29,44 @@ <Key latin:keyLabel="q" latin:keyHintLabel="1" - latin:popupCharacters="@string/alternates_for_q" + latin:moreKeys="@string/more_keys_for_q" latin:keyWidth="8.75%p" /> <Key latin:keyLabel="w" latin:keyHintLabel="2" - latin:popupCharacters="@string/alternates_for_w" /> + latin:moreKeys="@string/more_keys_for_w" /> <Key latin:keyLabel="e" latin:keyHintLabel="3" - latin:popupCharacters="@string/alternates_for_e" /> + latin:moreKeys="@string/more_keys_for_e" /> <Key latin:keyLabel="r" latin:keyHintLabel="4" - latin:popupCharacters="@string/alternates_for_r" /> + latin:moreKeys="@string/more_keys_for_r" /> <Key latin:keyLabel="t" latin:keyHintLabel="5" - latin:popupCharacters="@string/alternates_for_t" /> + latin:moreKeys="@string/more_keys_for_t" /> <Key latin:keyLabel="y" latin:keyHintLabel="6" - latin:popupCharacters="@string/alternates_for_y" /> + latin:moreKeys="@string/more_keys_for_y" /> <Key latin:keyLabel="u" latin:keyHintLabel="7" - latin:popupCharacters="@string/alternates_for_u" /> + latin:moreKeys="@string/more_keys_for_u" /> <Key latin:keyLabel="i" latin:keyHintLabel="8" - latin:popupCharacters="@string/alternates_for_i" /> + latin:moreKeys="@string/more_keys_for_i" /> <Key latin:keyLabel="o" latin:keyHintLabel="9" - latin:popupCharacters="@string/alternates_for_o" /> + latin:moreKeys="@string/more_keys_for_o" /> <Key latin:keyLabel="p" latin:keyHintLabel="0" - latin:popupCharacters="@string/alternates_for_p" /> + latin:moreKeys="@string/more_keys_for_p" /> <Key latin:keyLabel="å" latin:keyWidth="fillRight" /> @@ -76,35 +76,35 @@ > <Key latin:keyLabel="a" - latin:popupCharacters="@string/alternates_for_a" + latin:moreKeys="@string/more_keys_for_a" latin:keyWidth="8.75%p" /> <Key latin:keyLabel="s" - latin:popupCharacters="@string/alternates_for_s" /> + latin:moreKeys="@string/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:popupCharacters="@string/alternates_for_d" /> + latin:moreKeys="@string/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupCharacters="@string/alternates_for_g" /> + latin:moreKeys="@string/more_keys_for_g" /> <Key latin:keyLabel="h" /> <Key latin:keyLabel="j" /> <Key latin:keyLabel="k" - latin:popupCharacters="@string/alternates_for_k" /> + latin:moreKeys="@string/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:popupCharacters="@string/alternates_for_l" /> + latin:moreKeys="@string/more_keys_for_l" /> <Key latin:keyLabel="@string/keylabel_for_scandinavia_row2_10" - latin:popupCharacters="@string/alternates_for_scandinavia_row2_10" /> + latin:moreKeys="@string/more_keys_for_scandinavia_row2_10" /> <Key latin:keyLabel="@string/keylabel_for_scandinavia_row2_11" - latin:popupCharacters="@string/alternates_for_scandinavia_row2_11" + latin:moreKeys="@string/more_keys_for_scandinavia_row2_11" latin:keyWidth="fillRight" /> </Row> <include diff --git a/java/res/xml/kbd_rows_serbian.xml b/java/res/xml/kbd_rows_serbian.xml index 73c807f95..c911ae807 100644 --- a/java/res/xml/kbd_rows_serbian.xml +++ b/java/res/xml/kbd_rows_serbian.xml @@ -29,43 +29,43 @@ <Key latin:keyLabel="љ" latin:keyHintLabel="1" - latin:popupCharacters="1" /> + latin:moreKeys="1" /> <Key latin:keyLabel="њ" latin:keyHintLabel="2" - latin:popupCharacters="2" /> + latin:moreKeys="2" /> <Key latin:keyLabel="е" latin:keyHintLabel="3" - latin:popupCharacters="3" /> + latin:moreKeys="3" /> <Key latin:keyLabel="р" latin:keyHintLabel="4" - latin:popupCharacters="4" /> + latin:moreKeys="4" /> <Key latin:keyLabel="т" latin:keyHintLabel="5" - latin:popupCharacters="5" /> + latin:moreKeys="5" /> <Key latin:keyLabel="з" latin:keyHintLabel="6" - latin:popupCharacters="6" /> + latin:moreKeys="6" /> <Key latin:keyLabel="у" latin:keyHintLabel="7" - latin:popupCharacters="7" /> + latin:moreKeys="7" /> <Key latin:keyLabel="и" latin:keyHintLabel="8" - latin:popupCharacters="8" /> + latin:moreKeys="8" /> <Key latin:keyLabel="о" latin:keyHintLabel="9" - latin:popupCharacters="9" /> + latin:moreKeys="9" /> <Key latin:keyLabel="п" latin:keyHintLabel="0" - latin:popupCharacters="0" /> + latin:moreKeys="0" /> <Key latin:keyLabel="ш" latin:keyWidth="fillRight" /> diff --git a/java/res/xml/kbd_rows_spanish.xml b/java/res/xml/kbd_rows_spanish.xml index 6d007187f..03d631ee0 100644 --- a/java/res/xml/kbd_rows_spanish.xml +++ b/java/res/xml/kbd_rows_spanish.xml @@ -30,28 +30,28 @@ > <Key latin:keyLabel="a" - latin:popupCharacters="@string/alternates_for_a" /> + latin:moreKeys="@string/more_keys_for_a" /> <Key latin:keyLabel="s" - latin:popupCharacters="@string/alternates_for_s" /> + latin:moreKeys="@string/more_keys_for_s" /> <Key latin:keyLabel="d" - latin:popupCharacters="@string/alternates_for_d" /> + latin:moreKeys="@string/more_keys_for_d" /> <Key latin:keyLabel="f" /> <Key latin:keyLabel="g" - latin:popupCharacters="@string/alternates_for_g" /> + latin:moreKeys="@string/more_keys_for_g" /> <Key latin:keyLabel="h" /> <Key latin:keyLabel="j" /> <Key latin:keyLabel="k" - latin:popupCharacters="@string/alternates_for_k" /> + latin:moreKeys="@string/more_keys_for_k" /> <Key latin:keyLabel="l" - latin:popupCharacters="@string/alternates_for_l" /> + latin:moreKeys="@string/more_keys_for_l" /> <Key latin:keyLabel="ñ" /> </Row> diff --git a/java/res/xml/kbd_rows_symbols.xml b/java/res/xml/kbd_rows_symbols.xml index 5880d52c7..e0ede8ba6 100644 --- a/java/res/xml/kbd_rows_symbols.xml +++ b/java/res/xml/kbd_rows_symbols.xml @@ -30,34 +30,34 @@ > <Key latin:keyLabel="@string/keylabel_for_symbols_1" - latin:popupCharacters="@string/alternates_for_symbols_1" /> + latin:moreKeys="@string/more_keys_for_symbols_1" /> <Key latin:keyLabel="@string/keylabel_for_symbols_2" - latin:popupCharacters="@string/alternates_for_symbols_2" /> + latin:moreKeys="@string/more_keys_for_symbols_2" /> <Key latin:keyLabel="@string/keylabel_for_symbols_3" - latin:popupCharacters="@string/alternates_for_symbols_3" /> + latin:moreKeys="@string/more_keys_for_symbols_3" /> <Key latin:keyLabel="@string/keylabel_for_symbols_4" - latin:popupCharacters="@string/alternates_for_symbols_4" /> + latin:moreKeys="@string/more_keys_for_symbols_4" /> <Key latin:keyLabel="@string/keylabel_for_symbols_5" - latin:popupCharacters="@string/alternates_for_symbols_5" /> + latin:moreKeys="@string/more_keys_for_symbols_5" /> <Key latin:keyLabel="@string/keylabel_for_symbols_6" - latin:popupCharacters="@string/alternates_for_symbols_6" /> + latin:moreKeys="@string/more_keys_for_symbols_6" /> <Key latin:keyLabel="@string/keylabel_for_symbols_7" - latin:popupCharacters="@string/alternates_for_symbols_7" /> + latin:moreKeys="@string/more_keys_for_symbols_7" /> <Key latin:keyLabel="@string/keylabel_for_symbols_8" - latin:popupCharacters="@string/alternates_for_symbols_8" /> + latin:moreKeys="@string/more_keys_for_symbols_8" /> <Key latin:keyLabel="@string/keylabel_for_symbols_9" - latin:popupCharacters="@string/alternates_for_symbols_9" /> + latin:moreKeys="@string/more_keys_for_symbols_9" /> <Key latin:keyLabel="@string/keylabel_for_symbols_0" - latin:popupCharacters="@string/alternates_for_symbols_0" + latin:moreKeys="@string/more_keys_for_symbols_0" latin:keyWidth="fillRight" /> </Row> <Row @@ -71,24 +71,24 @@ latin:keyStyle="currencyKeyStyle" /> <Key latin:keyLabel="@string/keylabel_for_symbols_percent" - latin:popupCharacters="@string/alternates_for_symbols_percent" /> + latin:moreKeys="@string/more_keys_for_symbols_percent" /> <Key latin:keyLabel="&" /> <Key latin:keyLabel="*" - latin:popupCharacters="†,‡,★" /> + latin:moreKeys="†,‡,★" /> <Key latin:keyLabel="-" - latin:popupCharacters="_,–,—" /> + latin:moreKeys="_,–,—" /> <Key latin:keyLabel="+" - latin:popupCharacters="±" /> + latin:moreKeys="±" /> <Key latin:keyLabel="(" - latin:popupCharacters="[,{,<" /> + latin:moreKeys="[,{,<" /> <Key latin:keyLabel=")" - latin:popupCharacters="],},>" + latin:moreKeys="],},>" latin:keyWidth="fillRight" /> </Row> <Row @@ -100,26 +100,26 @@ latin:visualInsetsRight="1%p" /> <Key latin:keyLabel="!" - latin:popupCharacters="¡" /> + latin:moreKeys="¡" /> <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. --> - <!-- latin:popupCharacters="“,”,„,‟,«,»" --> + <!-- latin:moreKeys="“,”,„,‟,«,»" --> <Key latin:keyLabel=""" - latin:popupCharacters="“,”,«,»" - latin:maxMiniKeyboardColumn="6" /> + latin:moreKeys="“,”,«,»" + latin:maxMoreKeysColumn="6" /> <Key latin:keyLabel="\'" - latin:popupCharacters="‘,’,‚,‛" /> + latin:moreKeys="‘,’,‚,‛" /> <Key latin:keyLabel=":" /> <Key latin:keyLabel="@string/keylabel_for_symbols_semicolon" - latin:popupCharacters="@string/alternates_for_symbols_semicolon" /> + latin:moreKeys="@string/more_keys_for_symbols_semicolon" /> <Key latin:keyLabel="/" /> <Key latin:keyLabel="@string/keylabel_for_symbols_question" - latin:popupCharacters="@string/alternates_for_symbols_question" /> + latin:moreKeys="@string/more_keys_for_symbols_question" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" diff --git a/java/res/xml/kbd_rows_symbols_shift.xml b/java/res/xml/kbd_rows_symbols_shift.xml index ff272f1b0..66c14fea3 100644 --- a/java/res/xml/kbd_rows_symbols_shift.xml +++ b/java/res/xml/kbd_rows_symbols_shift.xml @@ -34,12 +34,12 @@ latin:keyLabel="|" /> <Key latin:keyLabel="•" - latin:popupCharacters="♪,♥,♠,♦,♣" /> + latin:moreKeys="♪,♥,♠,♦,♣" /> <Key latin:keyLabel="√" /> <Key latin:keyLabel="π" - latin:popupCharacters="Π" /> + latin:moreKeys="Π" /> <Key latin:keyLabel="÷" /> <Key @@ -63,15 +63,15 @@ latin:keyLabel="€" /> <Key latin:keyLabel="°" - latin:popupCharacters="′,″" /> + latin:moreKeys="′,″" /> <Key latin:keyLabel="^" - latin:popupCharacters="↑,↓,←,→" /> + latin:moreKeys="↑,↓,←,→" /> <Key latin:keyLabel="_" /> <Key latin:keyLabel="=" - latin:popupCharacters="≠,≈,∞" /> + latin:moreKeys="≠,≈,∞" /> <Key latin:keyLabel="[" /> <Key @@ -93,15 +93,15 @@ latin:keyLabel="©" /> <Key latin:keyLabel="¶" - latin:popupCharacters="§" /> + latin:moreKeys="§" /> <Key latin:keyLabel="\\" /> <Key latin:keyLabel="<" - latin:popupCharacters="≤,«,‹" /> + latin:moreKeys="≤,«,‹" /> <Key latin:keyLabel=">" - latin:popupCharacters="≥,»,›" /> + latin:moreKeys="≥,»,›" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" diff --git a/java/res/xml/kbd_suggestions_pane_template.xml b/java/res/xml/kbd_suggestions_pane_template.xml new file mode 100644 index 000000000..21316e6bb --- /dev/null +++ b/java/res/xml/kbd_suggestions_pane_template.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2011, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:keyWidth="10%p" + latin:rowHeight="@dimen/more_suggestions_row_height" + > +</Keyboard> diff --git a/java/res/xml/kbd_symbols_shift_row4.xml b/java/res/xml/kbd_symbols_shift_row4.xml index bcab19b06..c8d52932c 100644 --- a/java/res/xml/kbd_symbols_shift_row4.xml +++ b/java/res/xml/kbd_symbols_shift_row4.xml @@ -34,7 +34,7 @@ latin:keyWidth="15%p" /> <Key latin:keyLabel="„" - latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛" + latin:moreKeys="“,”,„,‟,«,»,‘,’,‚,‛" latin:keyStyle="functionalKeyStyle" /> <Key latin:keyStyle="spaceKeyStyle" @@ -55,7 +55,7 @@ latin:keyboardLayout="@xml/kbd_settings_or_tab" /> <Key latin:keyLabel="„" - latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛" + latin:moreKeys="“,”,„,‟,«,»,‘,’,‚,‛" latin:keyWidth="9.2%p" latin:keyStyle="functionalKeyStyle" /> <Key diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 452294e04..f2f3178de 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -20,7 +20,7 @@ <!-- The attributes in this XML file provide configuration information --> <!-- for the Input Method Manager. --> -<!-- Keyboard: en_US, en_GB, ar, cs, da, de, de_ZZ, es, es_US, fi, fr, fr_CA, fr_CH, hr, hu, it, iw, nb, nl, pl, pt, ru, sr, sv, tr --> +<!-- Keyboard: en_US, en_GB, ar, cs, da, de, de(QWERTY), es, es_US, fi, fr, fr_CA, fr_CH, hr, hu, it, iw, nb, nl, pl, pt, ru, sr, sv, tr --> <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. --> <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default subtype.--> @@ -64,9 +64,9 @@ /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_de_qwerty" - android:imeSubtypeLocale="de_ZZ" + android:imeSubtypeLocale="de" android:imeSubtypeMode="keyboard" - android:imeSubtypeExtraValue="AsciiCapable" + android:imeSubtypeExtraValue="AsciiCapable,KeyboardLocale=de_ZZ" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" |