From 9d5601e9013c5ec9a7ac75db16f4a0a8218b02bf Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Wed, 31 Aug 2011 15:26:32 +0900 Subject: Rename PopupCharactersParser to MoreKeySpecParser Also renames PopupPanel to MoreKeysPanel Change-Id: I37209a5a8fe7dbba1eef03e3be88ba5253653926 --- java/res/values-ar/donottranslate-altchars.xml | 77 ------- java/res/values-ar/donottranslate-more-keys.xml | 77 +++++++ java/res/values-ca/donottranslate-altchars.xml | 29 --- java/res/values-ca/donottranslate-more-keys.xml | 29 +++ java/res/values-cs/donottranslate-altchars.xml | 34 --- java/res/values-cs/donottranslate-more-keys.xml | 34 +++ java/res/values-da/donottranslate-altchars.xml | 35 ---- java/res/values-da/donottranslate-more-keys.xml | 35 ++++ java/res/values-de-rZZ/donottranslate-altchars.xml | 29 --- .../res/values-de-rZZ/donottranslate-more-keys.xml | 29 +++ java/res/values-de/donottranslate-altchars.xml | 29 --- java/res/values-de/donottranslate-more-keys.xml | 29 +++ java/res/values-en/donottranslate-altchars.xml | 29 --- java/res/values-en/donottranslate-more-keys.xml | 29 +++ java/res/values-es/donottranslate-altchars.xml | 29 --- java/res/values-es/donottranslate-more-keys.xml | 29 +++ java/res/values-fi/donottranslate-altchars.xml | 30 --- java/res/values-fi/donottranslate-more-keys.xml | 30 +++ java/res/values-fr/donottranslate-altchars.xml | 31 --- java/res/values-fr/donottranslate-more-keys.xml | 31 +++ java/res/values-hr/donottranslate-altchars.xml | 27 --- java/res/values-hr/donottranslate-more-keys.xml | 27 +++ java/res/values-hu/donottranslate-altchars.xml | 28 --- java/res/values-hu/donottranslate-more-keys.xml | 28 +++ java/res/values-it/donottranslate-altchars.xml | 26 --- java/res/values-it/donottranslate-more-keys.xml | 26 +++ java/res/values-lt/donottranslate-altchars.xml | 28 --- java/res/values-lt/donottranslate-more-keys.xml | 28 +++ java/res/values-lv/donottranslate-altchars.xml | 33 --- java/res/values-lv/donottranslate-more-keys.xml | 33 +++ java/res/values-nb/donottranslate-altchars.xml | 29 --- java/res/values-nb/donottranslate-more-keys.xml | 29 +++ java/res/values-nl/donottranslate-altchars.xml | 27 --- java/res/values-nl/donottranslate-more-keys.xml | 27 +++ java/res/values-pl/donottranslate-altchars.xml | 29 --- java/res/values-pl/donottranslate-more-keys.xml | 29 +++ java/res/values-pt/donottranslate-altchars.xml | 27 --- java/res/values-pt/donottranslate-more-keys.xml | 27 +++ java/res/values-rm/donottranslate-altchars.xml | 22 -- java/res/values-rm/donottranslate-more-keys.xml | 22 ++ java/res/values-ro/donottranslate-altchars.xml | 25 --- java/res/values-ro/donottranslate-more-keys.xml | 25 +++ java/res/values-ru/donottranslate-altchars.xml | 24 --- java/res/values-ru/donottranslate-more-keys.xml | 24 +++ java/res/values-sk/donottranslate-altchars.xml | 35 ---- java/res/values-sk/donottranslate-more-keys.xml | 35 ++++ java/res/values-sv/donottranslate-altchars.xml | 29 --- java/res/values-sv/donottranslate-more-keys.xml | 29 +++ java/res/values-sw600dp/config.xml | 4 +- java/res/values-sw768dp/config.xml | 4 +- java/res/values-tr/donottranslate-altchars.xml | 28 --- java/res/values-tr/donottranslate-more-keys.xml | 28 +++ java/res/values/attrs.xml | 16 +- java/res/values/config.xml | 4 +- java/res/values/donottranslate-altchars.xml | 99 --------- java/res/values/donottranslate-more-keys.xml | 99 +++++++++ java/res/values/styles.xml | 6 +- java/res/xml-sw600dp/kbd_key_styles.xml | 8 +- java/res/xml-sw600dp/kbd_qwerty_row1.xml | 20 +- java/res/xml-sw600dp/kbd_qwerty_row2.xml | 12 +- java/res/xml-sw600dp/kbd_qwerty_row3.xml | 8 +- java/res/xml-sw600dp/kbd_qwerty_row4.xml | 2 +- java/res/xml-sw600dp/kbd_row3_comma_period.xml | 4 +- java/res/xml-sw600dp/kbd_row3_smiley.xml | 4 +- java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml | 6 +- java/res/xml-sw600dp/kbd_rows_arabic.xml | 20 +- java/res/xml-sw600dp/kbd_rows_azerty.xml | 44 ++-- java/res/xml-sw600dp/kbd_rows_hebrew.xml | 18 +- java/res/xml-sw600dp/kbd_rows_qwertz.xml | 32 +-- java/res/xml-sw600dp/kbd_rows_russian.xml | 6 +- java/res/xml-sw600dp/kbd_rows_scandinavian.xml | 44 ++-- java/res/xml-sw600dp/kbd_rows_spanish.xml | 12 +- java/res/xml-sw600dp/kbd_rows_symbols.xml | 52 ++--- java/res/xml-sw600dp/kbd_rows_symbols_shift.xml | 12 +- java/res/xml-sw768dp/kbd_key_styles.xml | 6 +- java/res/xml-sw768dp/kbd_qwerty_row1.xml | 20 +- java/res/xml-sw768dp/kbd_qwerty_row2.xml | 12 +- java/res/xml-sw768dp/kbd_qwerty_row3.xml | 8 +- java/res/xml-sw768dp/kbd_qwerty_row4.xml | 4 +- java/res/xml-sw768dp/kbd_row3_comma_period.xml | 4 +- java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml | 6 +- java/res/xml-sw768dp/kbd_rows_arabic.xml | 16 +- java/res/xml-sw768dp/kbd_rows_azerty.xml | 46 ++--- java/res/xml-sw768dp/kbd_rows_hebrew.xml | 14 +- java/res/xml-sw768dp/kbd_rows_qwertz.xml | 32 +-- java/res/xml-sw768dp/kbd_rows_russian.xml | 2 +- java/res/xml-sw768dp/kbd_rows_scandinavian.xml | 44 ++-- java/res/xml-sw768dp/kbd_rows_spanish.xml | 12 +- java/res/xml-sw768dp/kbd_rows_symbols.xml | 52 ++--- java/res/xml-sw768dp/kbd_rows_symbols_shift.xml | 12 +- java/res/xml/kbd_currency_key_styles.xml | 12 +- java/res/xml/kbd_key_styles.xml | 16 +- java/res/xml/kbd_qwerty_row1.xml | 20 +- java/res/xml/kbd_qwerty_row2.xml | 12 +- java/res/xml/kbd_qwerty_row3.xml | 8 +- java/res/xml/kbd_rows_arabic.xml | 36 ++-- java/res/xml/kbd_rows_azerty.xml | 42 ++-- java/res/xml/kbd_rows_hebrew.xml | 14 +- java/res/xml/kbd_rows_qwertz.xml | 28 +-- java/res/xml/kbd_rows_russian.xml | 24 +-- java/res/xml/kbd_rows_scandinavian.xml | 36 ++-- java/res/xml/kbd_rows_serbian.xml | 20 +- java/res/xml/kbd_rows_spanish.xml | 12 +- java/res/xml/kbd_rows_symbols.xml | 46 ++--- java/res/xml/kbd_rows_symbols_shift.xml | 16 +- java/res/xml/kbd_symbols_shift_row4.xml | 4 +- java/src/com/android/inputmethod/keyboard/Key.java | 50 ++--- .../com/android/inputmethod/keyboard/Keyboard.java | 6 +- .../android/inputmethod/keyboard/KeyboardView.java | 10 +- .../inputmethod/keyboard/LatinKeyboardView.java | 104 +++++----- .../android/inputmethod/keyboard/MiniKeyboard.java | 22 +- .../inputmethod/keyboard/MiniKeyboardView.java | 8 +- .../inputmethod/keyboard/MoreKeysPanel.java | 59 ++++++ .../inputmethod/keyboard/PointerTracker.java | 22 +- .../android/inputmethod/keyboard/PopupPanel.java | 54 ----- .../inputmethod/keyboard/internal/KeyStyles.java | 4 +- .../keyboard/internal/KeyboardBuilder.java | 10 +- .../keyboard/internal/KeyboardParams.java | 2 +- .../keyboard/internal/MoreKeySpecParser.java | 230 +++++++++++++++++++++ .../keyboard/internal/PopupCharactersParser.java | 230 --------------------- 120 files changed, 1764 insertions(+), 1757 deletions(-) delete mode 100644 java/res/values-ar/donottranslate-altchars.xml create mode 100644 java/res/values-ar/donottranslate-more-keys.xml delete mode 100644 java/res/values-ca/donottranslate-altchars.xml create mode 100644 java/res/values-ca/donottranslate-more-keys.xml delete mode 100644 java/res/values-cs/donottranslate-altchars.xml create mode 100644 java/res/values-cs/donottranslate-more-keys.xml delete mode 100644 java/res/values-da/donottranslate-altchars.xml create mode 100644 java/res/values-da/donottranslate-more-keys.xml delete mode 100644 java/res/values-de-rZZ/donottranslate-altchars.xml create mode 100644 java/res/values-de-rZZ/donottranslate-more-keys.xml delete mode 100644 java/res/values-de/donottranslate-altchars.xml create mode 100644 java/res/values-de/donottranslate-more-keys.xml delete mode 100644 java/res/values-en/donottranslate-altchars.xml create mode 100644 java/res/values-en/donottranslate-more-keys.xml delete mode 100644 java/res/values-es/donottranslate-altchars.xml create mode 100644 java/res/values-es/donottranslate-more-keys.xml delete mode 100644 java/res/values-fi/donottranslate-altchars.xml create mode 100644 java/res/values-fi/donottranslate-more-keys.xml delete mode 100644 java/res/values-fr/donottranslate-altchars.xml create mode 100644 java/res/values-fr/donottranslate-more-keys.xml delete mode 100644 java/res/values-hr/donottranslate-altchars.xml create mode 100644 java/res/values-hr/donottranslate-more-keys.xml delete mode 100644 java/res/values-hu/donottranslate-altchars.xml create mode 100644 java/res/values-hu/donottranslate-more-keys.xml delete mode 100644 java/res/values-it/donottranslate-altchars.xml create mode 100644 java/res/values-it/donottranslate-more-keys.xml delete mode 100644 java/res/values-lt/donottranslate-altchars.xml create mode 100644 java/res/values-lt/donottranslate-more-keys.xml delete mode 100644 java/res/values-lv/donottranslate-altchars.xml create mode 100644 java/res/values-lv/donottranslate-more-keys.xml delete mode 100644 java/res/values-nb/donottranslate-altchars.xml create mode 100644 java/res/values-nb/donottranslate-more-keys.xml delete mode 100644 java/res/values-nl/donottranslate-altchars.xml create mode 100644 java/res/values-nl/donottranslate-more-keys.xml delete mode 100644 java/res/values-pl/donottranslate-altchars.xml create mode 100644 java/res/values-pl/donottranslate-more-keys.xml delete mode 100644 java/res/values-pt/donottranslate-altchars.xml create mode 100644 java/res/values-pt/donottranslate-more-keys.xml delete mode 100644 java/res/values-rm/donottranslate-altchars.xml create mode 100644 java/res/values-rm/donottranslate-more-keys.xml delete mode 100644 java/res/values-ro/donottranslate-altchars.xml create mode 100644 java/res/values-ro/donottranslate-more-keys.xml delete mode 100644 java/res/values-ru/donottranslate-altchars.xml create mode 100644 java/res/values-ru/donottranslate-more-keys.xml delete mode 100644 java/res/values-sk/donottranslate-altchars.xml create mode 100644 java/res/values-sk/donottranslate-more-keys.xml delete mode 100644 java/res/values-sv/donottranslate-altchars.xml create mode 100644 java/res/values-sv/donottranslate-more-keys.xml delete mode 100644 java/res/values-tr/donottranslate-altchars.xml create mode 100644 java/res/values-tr/donottranslate-more-keys.xml delete mode 100644 java/res/values/donottranslate-altchars.xml create mode 100644 java/res/values/donottranslate-more-keys.xml create mode 100644 java/src/com/android/inputmethod/keyboard/MoreKeysPanel.java delete mode 100644 java/src/com/android/inputmethod/keyboard/PopupPanel.java create mode 100644 java/src/com/android/inputmethod/keyboard/internal/MoreKeySpecParser.java delete mode 100644 java/src/com/android/inputmethod/keyboard/internal/PopupCharactersParser.java (limited to 'java') diff --git a/java/res/values-ar/donottranslate-altchars.xml b/java/res/values-ar/donottranslate-altchars.xml deleted file mode 100644 index 6f2a3ff7d..000000000 --- a/java/res/values-ar/donottranslate-altchars.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - "\u060c,\u061b,\u061f,!,:,-,/,\',\",\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d" - 9 - \u064b - "١" - "٢" - "٣" - "٤" - "٥" - "٦" - "٧" - "٨" - "٩" - "٠" - 1,¹,½,⅓,¼,⅛ - 2,²,⅔ - 3,³,¾,⅜ - 4,⁴ - 5,⅝ - 6 - 7,⅞ - 8 - 9 - 0,ⁿ,∅ - \u060c - \u060c - \u061f - \u061b - - \u066a - , - , - - \\,,\@icon/3|\@integer/key_settings - - \\,,\@icon/7|\@integer/key_tab - \?,¿ - ; - %,‰ - "،" - "." - "؟" - "\u064b" - "\u061f,\u061b,!,:,-,/,\',\"" - "\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d" - diff --git a/java/res/values-ar/donottranslate-more-keys.xml b/java/res/values-ar/donottranslate-more-keys.xml new file mode 100644 index 000000000..6f2a3ff7d --- /dev/null +++ b/java/res/values-ar/donottranslate-more-keys.xml @@ -0,0 +1,77 @@ + + + + + "\u060c,\u061b,\u061f,!,:,-,/,\',\",\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d" + 9 + \u064b + "١" + "٢" + "٣" + "٤" + "٥" + "٦" + "٧" + "٨" + "٩" + "٠" + 1,¹,½,⅓,¼,⅛ + 2,²,⅔ + 3,³,¾,⅜ + 4,⁴ + 5,⅝ + 6 + 7,⅞ + 8 + 9 + 0,ⁿ,∅ + \u060c + \u060c + \u061f + \u061b + + \u066a + , + , + + \\,,\@icon/3|\@integer/key_settings + + \\,,\@icon/7|\@integer/key_tab + \?,¿ + ; + %,‰ + "،" + "." + "؟" + "\u064b" + "\u061f,\u061b,!,:,-,/,\',\"" + "\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d" + diff --git a/java/res/values-ca/donottranslate-altchars.xml b/java/res/values-ca/donottranslate-altchars.xml deleted file mode 100644 index 336057be0..000000000 --- a/java/res/values-ca/donottranslate-altchars.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - à,á,ä,â,ã,å,ą,æ,ā,ª - 3,è,é,ë,ê,ę,ė,ē - 8,í,ï,ì,î,į,ī - 9,ò,ó,ö,ô,õ,ø,œ,ō,º - 7,ú,ü,ù,û,ū - ñ,ń - ç,ć,č - ŀ,ł - diff --git a/java/res/values-ca/donottranslate-more-keys.xml b/java/res/values-ca/donottranslate-more-keys.xml new file mode 100644 index 000000000..336057be0 --- /dev/null +++ b/java/res/values-ca/donottranslate-more-keys.xml @@ -0,0 +1,29 @@ + + + + à,á,ä,â,ã,å,ą,æ,ā,ª + 3,è,é,ë,ê,ę,ė,ē + 8,í,ï,ì,î,į,ī + 9,ò,ó,ö,ô,õ,ø,œ,ō,º + 7,ú,ü,ù,û,ū + ñ,ń + ç,ć,č + ŀ,ł + 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 @@ - - - - á,à,â,ä,æ,ã,å,ā - 3,é,ě,è,ê,ë,ę,ė,ē - 8,í,î,ï,ì,į,ī - 9,ó,ö,ô,ò,õ,œ,ø,ō - 7,ú,ů,û,ü,ù,ū - š,ß,ś - ň,ñ,ń - č,ç,ć - ý,ÿ - ď - 4,ř - 5,ť - 6,ž,ź,ż - diff --git a/java/res/values-cs/donottranslate-more-keys.xml b/java/res/values-cs/donottranslate-more-keys.xml new file mode 100644 index 000000000..541cd2154 --- /dev/null +++ b/java/res/values-cs/donottranslate-more-keys.xml @@ -0,0 +1,34 @@ + + + + á,à,â,ä,æ,ã,å,ā + 3,é,ě,è,ê,ë,ę,ė,ē + 8,í,î,ï,ì,į,ī + 9,ó,ö,ô,ò,õ,œ,ø,ō + 7,ú,ů,û,ü,ù,ū + š,ß,ś + ň,ñ,ń + č,ç,ć + ý,ÿ + ď + 4,ř + 5,ť + 6,ž,ź,ż + diff --git a/java/res/values-da/donottranslate-altchars.xml b/java/res/values-da/donottranslate-altchars.xml deleted file mode 100644 index 46f1644ad..000000000 --- a/java/res/values-da/donottranslate-altchars.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - á,ä,à,â,ã,ā - 3,é,ë - 8,í,ï - 9,ó,ô,ò,õ,œ,ō - 7,ú,ü,û,ù,ū - ß,ś,š - ñ,ń - 6,ý,ÿ - ð - ł - æ - ø - ä - ö - diff --git a/java/res/values-da/donottranslate-more-keys.xml b/java/res/values-da/donottranslate-more-keys.xml new file mode 100644 index 000000000..46f1644ad --- /dev/null +++ b/java/res/values-da/donottranslate-more-keys.xml @@ -0,0 +1,35 @@ + + + + á,ä,à,â,ã,ā + 3,é,ë + 8,í,ï + 9,ó,ô,ò,õ,œ,ō + 7,ú,ü,û,ù,ū + ß,ś,š + ñ,ń + 6,ý,ÿ + ð + ł + æ + ø + ä + ö + 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 @@ - - - - ä,â,à,á,æ,ã,å,ā - 3,ė - 9,ö,ô,ò,ó,õ,œ,ø,ō - 7,ü,û,ù,ú,ū - ß,ś,š - ñ,ń - 6 - - diff --git a/java/res/values-de-rZZ/donottranslate-more-keys.xml b/java/res/values-de-rZZ/donottranslate-more-keys.xml new file mode 100644 index 000000000..a6f8fc810 --- /dev/null +++ b/java/res/values-de-rZZ/donottranslate-more-keys.xml @@ -0,0 +1,29 @@ + + + + ä,â,à,á,æ,ã,å,ā + 3,ė + 9,ö,ô,ò,ó,õ,œ,ø,ō + 7,ü,û,ù,ú,ū + ß,ś,š + ñ,ń + 6 + + diff --git a/java/res/values-de/donottranslate-altchars.xml b/java/res/values-de/donottranslate-altchars.xml deleted file mode 100644 index 8b8b6aed7..000000000 --- a/java/res/values-de/donottranslate-altchars.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - ä,â,à,á,æ,ã,å,ā - 3,ė - 9,ö,ô,ò,ó,õ,œ,ø,ō - 7,ü,û,ù,ú,ū - ß,ś,š - ñ,ń - - 6 - 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..8b8b6aed7 --- /dev/null +++ b/java/res/values-de/donottranslate-more-keys.xml @@ -0,0 +1,29 @@ + + + + ä,â,à,á,æ,ã,å,ā + 3,ė + 9,ö,ô,ò,ó,õ,œ,ø,ō + 7,ü,û,ù,ú,ū + ß,ś,š + ñ,ń + + 6 + diff --git a/java/res/values-en/donottranslate-altchars.xml b/java/res/values-en/donottranslate-altchars.xml deleted file mode 100644 index 29582c950..000000000 --- a/java/res/values-en/donottranslate-altchars.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - à,á,â,ä,æ,ã,å,ā - 3,è,é,ê,ë,ē - 8,î,ï,í,ī,ì - 9,ô,ö,ò,ó,œ,ø,ō,õ - ß - 7,û,ü,ù,ú,ū - ñ - ç - 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..29582c950 --- /dev/null +++ b/java/res/values-en/donottranslate-more-keys.xml @@ -0,0 +1,29 @@ + + + + à,á,â,ä,æ,ã,å,ā + 3,è,é,ê,ë,ē + 8,î,ï,í,ī,ì + 9,ô,ö,ò,ó,œ,ø,ō,õ + ß + 7,û,ü,ù,ú,ū + ñ + ç + diff --git a/java/res/values-es/donottranslate-altchars.xml b/java/res/values-es/donottranslate-altchars.xml deleted file mode 100644 index e1f849f62..000000000 --- a/java/res/values-es/donottranslate-altchars.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - á,à,ä,â,ã,å,ą,æ,ā,ª - 3,é,è,ë,ê,ę,ė,ē - 8,í,ï,ì,î,į,ī - 9,ó,ò,ö,ô,õ,ø,œ,ō,º - 7,ú,ü,ù,û,ū - ñ,ń - ç,ć,č - "\\,,\?,!,¿,¡,:,-,\',\",),(,/,;,+,&,\@" - diff --git a/java/res/values-es/donottranslate-more-keys.xml b/java/res/values-es/donottranslate-more-keys.xml new file mode 100644 index 000000000..e1f849f62 --- /dev/null +++ b/java/res/values-es/donottranslate-more-keys.xml @@ -0,0 +1,29 @@ + + + + á,à,ä,â,ã,å,ą,æ,ā,ª + 3,é,è,ë,ê,ę,ė,ē + 8,í,ï,ì,î,į,ī + 9,ó,ò,ö,ô,õ,ø,œ,ō,º + 7,ú,ü,ù,û,ū + ñ,ń + ç,ć,č + "\\,,\?,!,¿,¡,:,-,\',\",),(,/,;,+,&,\@" + diff --git a/java/res/values-fi/donottranslate-altchars.xml b/java/res/values-fi/donottranslate-altchars.xml deleted file mode 100644 index ff87a3258..000000000 --- a/java/res/values-fi/donottranslate-altchars.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - æ,à,á,â,ã,ā - 9,ø,ô,ò,ó,õ,œ,ō - 7,ü - š,ß,ś - ž,ź,ż - ö - ä - ø - æ - diff --git a/java/res/values-fi/donottranslate-more-keys.xml b/java/res/values-fi/donottranslate-more-keys.xml new file mode 100644 index 000000000..ff87a3258 --- /dev/null +++ b/java/res/values-fi/donottranslate-more-keys.xml @@ -0,0 +1,30 @@ + + + + æ,à,á,â,ã,ā + 9,ø,ô,ò,ó,õ,œ,ō + 7,ü + š,ß,ś + ž,ź,ż + ö + ä + ø + æ + diff --git a/java/res/values-fr/donottranslate-altchars.xml b/java/res/values-fr/donottranslate-altchars.xml deleted file mode 100644 index ae9292f91..000000000 --- a/java/res/values-fr/donottranslate-altchars.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - à,â,1,æ,á,ä,ã,å,ā,ª - é,è,ê,ë,3,ę,ė,ē - î,8,ï,ì,í,į,ī - ô,œ,9,ö,ò,ó,õ,ø,ō,º - ù,û,7,ü,ú,ū - ç,ć,č - 6,ÿ - - - 2 - diff --git a/java/res/values-fr/donottranslate-more-keys.xml b/java/res/values-fr/donottranslate-more-keys.xml new file mode 100644 index 000000000..ae9292f91 --- /dev/null +++ b/java/res/values-fr/donottranslate-more-keys.xml @@ -0,0 +1,31 @@ + + + + à,â,1,æ,á,ä,ã,å,ā,ª + é,è,ê,ë,3,ę,ė,ē + î,8,ï,ì,í,į,ī + ô,œ,9,ö,ò,ó,õ,ø,ō,º + ù,û,7,ü,ú,ū + ç,ć,č + 6,ÿ + + + 2 + diff --git a/java/res/values-hr/donottranslate-altchars.xml b/java/res/values-hr/donottranslate-altchars.xml deleted file mode 100644 index d0c9d4049..000000000 --- a/java/res/values-hr/donottranslate-altchars.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - š,ś,ß - ñ,ń - - 6,ž,ź,ż - č,ć,ç - đ - diff --git a/java/res/values-hr/donottranslate-more-keys.xml b/java/res/values-hr/donottranslate-more-keys.xml new file mode 100644 index 000000000..d0c9d4049 --- /dev/null +++ b/java/res/values-hr/donottranslate-more-keys.xml @@ -0,0 +1,27 @@ + + + + š,ś,ß + ñ,ń + + 6,ž,ź,ż + č,ć,ç + đ + diff --git a/java/res/values-hu/donottranslate-altchars.xml b/java/res/values-hu/donottranslate-altchars.xml deleted file mode 100644 index ae28cc5b8..000000000 --- a/java/res/values-hu/donottranslate-altchars.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - á,à,â,ä,æ,ã,å,ā - 3,é,è,ê,ë,ę,ė,ē - 8,í,î,ï,ì,į,ī - 9,ó,ö,ő,ô,ò,õ,œ,ø,ō - 7,ú,ü,ű,û,ù,ū - - 6 - diff --git a/java/res/values-hu/donottranslate-more-keys.xml b/java/res/values-hu/donottranslate-more-keys.xml new file mode 100644 index 000000000..ae28cc5b8 --- /dev/null +++ b/java/res/values-hu/donottranslate-more-keys.xml @@ -0,0 +1,28 @@ + + + + á,à,â,ä,æ,ã,å,ā + 3,é,è,ê,ë,ę,ė,ē + 8,í,î,ï,ì,į,ī + 9,ó,ö,ő,ô,ò,õ,œ,ø,ō + 7,ú,ü,ű,û,ù,ū + + 6 + diff --git a/java/res/values-it/donottranslate-altchars.xml b/java/res/values-it/donottranslate-altchars.xml deleted file mode 100644 index 1131d4852..000000000 --- a/java/res/values-it/donottranslate-altchars.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - à,á,â,ä,æ,ã,å,ā,ª - 3,è,é,ê,ë,ę,ė,ē - 8,ì,í,î,ï,į,ī - 9,ò,ó,ô,ö,õ,œ,ø,ō,º - 7,ù,ú,û,ü,ū - diff --git a/java/res/values-it/donottranslate-more-keys.xml b/java/res/values-it/donottranslate-more-keys.xml new file mode 100644 index 000000000..1131d4852 --- /dev/null +++ b/java/res/values-it/donottranslate-more-keys.xml @@ -0,0 +1,26 @@ + + + + à,á,â,ä,æ,ã,å,ā,ª + 3,è,é,ê,ë,ę,ė,ē + 8,ì,í,î,ï,į,ī + 9,ò,ó,ô,ö,õ,œ,ø,ō,º + 7,ù,ú,û,ü,ū + diff --git a/java/res/values-lt/donottranslate-altchars.xml b/java/res/values-lt/donottranslate-altchars.xml deleted file mode 100644 index 4aba93a3a..000000000 --- a/java/res/values-lt/donottranslate-altchars.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - ą,à,á,â,ä,æ,ã,å,ā - 3,ė,ę,è,é,ê,ë,ē - 8,į,î,ï,ì,í,ī - 7,ų,ū,û,ü,ù,ú - š,ß,ś - č,ç,ć - ž,ź,ż - 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..4aba93a3a --- /dev/null +++ b/java/res/values-lt/donottranslate-more-keys.xml @@ -0,0 +1,28 @@ + + + + ą,à,á,â,ä,æ,ã,å,ā + 3,ė,ę,è,é,ê,ë,ē + 8,į,î,ï,ì,í,ī + 7,ų,ū,û,ü,ù,ú + š,ß,ś + č,ç,ć + ž,ź,ż + 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 @@ - - - - ā,à,á,â,ä,æ,ã,å - 3,ē,è,é,ê,ë,ę,ė - 8,ī,î,ï,ì,í,į - 7,ū,û,ü,ù,ú - š,ß,ś - ņ,ñ,ń - č,ç,ć - 4,ŗ - ž,ź,ż - ķ - ļ,ł - ģ - 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..05d9bc894 --- /dev/null +++ b/java/res/values-lv/donottranslate-more-keys.xml @@ -0,0 +1,33 @@ + + + + ā,à,á,â,ä,æ,ã,å + 3,ē,è,é,ê,ë,ę,ė + 8,ī,î,ï,ì,í,į + 7,ū,û,ü,ù,ú + š,ß,ś + ņ,ñ,ń + č,ç,ć + 4,ŗ + ž,ź,ż + ķ + ļ,ł + ģ + diff --git a/java/res/values-nb/donottranslate-altchars.xml b/java/res/values-nb/donottranslate-altchars.xml deleted file mode 100644 index 798e51c9a..000000000 --- a/java/res/values-nb/donottranslate-altchars.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - à,ä,á,â,ã,ā - 3,é,è,ê,ë,ę,ė,ē - 9,ô,ò,ó,ö,õ,œ,ō - 7,ü,û,ù,ú,ū - ø - æ - ö - ä - diff --git a/java/res/values-nb/donottranslate-more-keys.xml b/java/res/values-nb/donottranslate-more-keys.xml new file mode 100644 index 000000000..798e51c9a --- /dev/null +++ b/java/res/values-nb/donottranslate-more-keys.xml @@ -0,0 +1,29 @@ + + + + à,ä,á,â,ã,ā + 3,é,è,ê,ë,ę,ė,ē + 9,ô,ò,ó,ö,õ,œ,ō + 7,ü,û,ù,ú,ū + ø + æ + ö + ä + diff --git a/java/res/values-nl/donottranslate-altchars.xml b/java/res/values-nl/donottranslate-altchars.xml deleted file mode 100644 index e26a74967..000000000 --- a/java/res/values-nl/donottranslate-altchars.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - á,ä,â,à,æ,ã,å,ā - 3,é,ë,ê,è,ę,ė,ē - 8,í,ï,ì,î,į,ī - 9,ó,ö,ô,ò,õ,œ,ø,ō - 7,ú,ü,û,ù,ū - ñ,ń - diff --git a/java/res/values-nl/donottranslate-more-keys.xml b/java/res/values-nl/donottranslate-more-keys.xml new file mode 100644 index 000000000..e26a74967 --- /dev/null +++ b/java/res/values-nl/donottranslate-more-keys.xml @@ -0,0 +1,27 @@ + + + + á,ä,â,à,æ,ã,å,ā + 3,é,ë,ê,è,ę,ė,ē + 8,í,ï,ì,î,į,ī + 9,ó,ö,ô,ò,õ,œ,ø,ō + 7,ú,ü,û,ù,ū + ñ,ń + 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 @@ - - - - ą,á,à,â,ä,æ,ã,å,ā - 3,ę,è,é,ê,ë,ė,ē - 9,ó,ö,ô,ò,õ,œ,ø,ō - ś,ß,š - ń,ñ - ć,ç,č - ż,ź,ž - ł - diff --git a/java/res/values-pl/donottranslate-more-keys.xml b/java/res/values-pl/donottranslate-more-keys.xml new file mode 100644 index 000000000..971d73bc5 --- /dev/null +++ b/java/res/values-pl/donottranslate-more-keys.xml @@ -0,0 +1,29 @@ + + + + ą,á,à,â,ä,æ,ã,å,ā + 3,ę,è,é,ê,ë,ė,ē + 9,ó,ö,ô,ò,õ,œ,ø,ō + ś,ß,š + ń,ñ + ć,ç,č + ż,ź,ž + ł + diff --git a/java/res/values-pt/donottranslate-altchars.xml b/java/res/values-pt/donottranslate-altchars.xml deleted file mode 100644 index a39976151..000000000 --- a/java/res/values-pt/donottranslate-altchars.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - á,ã,à,â,ä,å,æ,ª - 3,é,ê,è,ę,ė,ē,ë - 8,í,î,ì,ï,į,ī - 9,ó,õ,ô,ò,ö,œ,ø,ō,º - 7,ú,ü,ù,û,ū - ç,č,ć - diff --git a/java/res/values-pt/donottranslate-more-keys.xml b/java/res/values-pt/donottranslate-more-keys.xml new file mode 100644 index 000000000..a39976151 --- /dev/null +++ b/java/res/values-pt/donottranslate-more-keys.xml @@ -0,0 +1,27 @@ + + + + á,ã,à,â,ä,å,æ,ª + 3,é,ê,è,ę,ė,ē,ë + 8,í,î,ì,ï,į,ī + 9,ó,õ,ô,ò,ö,œ,ø,ō,º + 7,ú,ü,ù,û,ū + ç,č,ć + diff --git a/java/res/values-rm/donottranslate-altchars.xml b/java/res/values-rm/donottranslate-altchars.xml deleted file mode 100644 index 0a5d2aad1..000000000 --- a/java/res/values-rm/donottranslate-altchars.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - 9,ò,ó,ö,ô,õ,œ,ø - diff --git a/java/res/values-rm/donottranslate-more-keys.xml b/java/res/values-rm/donottranslate-more-keys.xml new file mode 100644 index 000000000..0a5d2aad1 --- /dev/null +++ b/java/res/values-rm/donottranslate-more-keys.xml @@ -0,0 +1,22 @@ + + + + 9,ò,ó,ö,ô,õ,œ,ø + diff --git a/java/res/values-ro/donottranslate-altchars.xml b/java/res/values-ro/donottranslate-altchars.xml deleted file mode 100644 index 728ead472..000000000 --- a/java/res/values-ro/donottranslate-altchars.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - ă,â,à,á,ä,æ,ã,å,ā - 8,î,ï,ì,í,į,ī - ș,ß,ś,š - 5,ț - diff --git a/java/res/values-ro/donottranslate-more-keys.xml b/java/res/values-ro/donottranslate-more-keys.xml new file mode 100644 index 000000000..728ead472 --- /dev/null +++ b/java/res/values-ro/donottranslate-more-keys.xml @@ -0,0 +1,25 @@ + + + + ă,â,à,á,ä,æ,ã,å,ā + 8,î,ï,ì,í,į,ī + ș,ß,ś,š + 5,ț + diff --git a/java/res/values-ru/donottranslate-altchars.xml b/java/res/values-ru/donottranslate-altchars.xml deleted file mode 100644 index 2a24e563e..000000000 --- a/java/res/values-ru/donottranslate-altchars.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 5,ё - ъ - ъ - diff --git a/java/res/values-ru/donottranslate-more-keys.xml b/java/res/values-ru/donottranslate-more-keys.xml new file mode 100644 index 000000000..2a24e563e --- /dev/null +++ b/java/res/values-ru/donottranslate-more-keys.xml @@ -0,0 +1,24 @@ + + + + 5,ё + ъ + ъ + 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 @@ - - - - ä,á,à,â,æ,ã,å,ā - 3,é,ě,è,ê,ë,ę,ė,ē - 8,í,î,ï,ì,į,ī - 9,ô,ó,ö,ò,õ,œ,ø,ō - 7,ú,ú,û,ü,ù,ū - š,ß,ś - ň,ñ,ń - č,ç,ć - 6,ý,ÿ - ď - 4,ŕ,ř - 5,ť - ž,ź,ż - ľ,ĺ,ł - 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..6d9836e9c --- /dev/null +++ b/java/res/values-sk/donottranslate-more-keys.xml @@ -0,0 +1,35 @@ + + + + ä,á,à,â,æ,ã,å,ā + 3,é,ě,è,ê,ë,ę,ė,ē + 8,í,î,ï,ì,į,ī + 9,ô,ó,ö,ò,õ,œ,ø,ō + 7,ú,ú,û,ü,ù,ū + š,ß,ś + ň,ñ,ń + č,ç,ć + 6,ý,ÿ + ď + 4,ŕ,ř + 5,ť + ž,ź,ż + ľ,ĺ,ł + diff --git a/java/res/values-sv/donottranslate-altchars.xml b/java/res/values-sv/donottranslate-altchars.xml deleted file mode 100644 index d03ae1a6c..000000000 --- a/java/res/values-sv/donottranslate-altchars.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - 3,é,è,ê,ë,ę - 9,œ,ô,ò,ó,õ,ō - 7,ü,û,ù,ú,ū - ß,ś,š - ö - ä - ø - æ - diff --git a/java/res/values-sv/donottranslate-more-keys.xml b/java/res/values-sv/donottranslate-more-keys.xml new file mode 100644 index 000000000..d03ae1a6c --- /dev/null +++ b/java/res/values-sv/donottranslate-more-keys.xml @@ -0,0 +1,29 @@ + + + + 3,é,è,ê,ë,ę + 9,œ,ô,ò,ó,õ,ō + 7,ü,û,ù,ú,ū + ß,ś,š + ö + ä + ø + æ + 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 @@ false false false - false + false false true @@ -39,5 +39,5 @@ 5 medium - 5 + 5 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 @@ false false false - false + false false true @@ -37,7 +37,7 @@ 5 medium - 5 + 5 2 diff --git a/java/res/values-tr/donottranslate-altchars.xml b/java/res/values-tr/donottranslate-altchars.xml deleted file mode 100644 index 1b83b65c8..000000000 --- a/java/res/values-tr/donottranslate-altchars.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - â - 8,ı,î,ï,ì,í,į,ī - 9,ö,ô,œ,ò,ó,õ,ø,ō - 7,ü,û,ù,ú,ū - ş,ß,ś,š - ğ - ç,ć,č - diff --git a/java/res/values-tr/donottranslate-more-keys.xml b/java/res/values-tr/donottranslate-more-keys.xml new file mode 100644 index 000000000..1b83b65c8 --- /dev/null +++ b/java/res/values-tr/donottranslate-more-keys.xml @@ -0,0 +1,28 @@ + + + + â + 8,ı,î,ï,ì,í,į,ī + 9,ö,ô,œ,ò,ó,õ,ø,ō + 7,ü,û,ù,ú,ū + ş,ß,ś,š + ğ + ç,ć,č + diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 734004f5a..fdeca258f 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -95,8 +95,8 @@ - - + + @@ -153,8 +153,8 @@ - - + + @@ -178,10 +178,10 @@ - - - - + + + + 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 @@ true false true - true + true true 5 small - 5 + 5 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 @@ - - - - - 3 - 8 - 9 - 7 - - - - 6 - 1 - 2 - - 4 - 5 - - - - - 0 - - - - - - - - - ¢,£,€,¥,₱ - ¢,£,$,¥,₱ - ¢,$,€,¥,₱ - ¢,$,€,£,¥,₱ - ":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\\\\\|:-\\\\\\\\ ,:\'(|:\'( ,:-D|:-D " - "\\,,\?,!,:,-,\',\",(,),/,;,+,&,\@" - 7 - - ".com" - - ".net,.org,.gov,.edu" - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 0 - ¹,½,⅓,¼,⅛ - ²,⅔ - ³,¾,⅜ - ⁴ - ⅝ - - ⅞ - - - ⁿ,∅ - , - , - \? - ; - % - - - - \@icon/3|\@integer/key_settings - - \@icon/7|\@integer/key_tab - ¿ - - ‰ - \' - - - \" - _ - \" - _ - diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml new file mode 100644 index 000000000..acbf7dfae --- /dev/null +++ b/java/res/values/donottranslate-more-keys.xml @@ -0,0 +1,99 @@ + + + + + 3 + 8 + 9 + 7 + + + + 6 + 1 + 2 + + 4 + 5 + + + + + 0 + + + + + + + + + ¢,£,€,¥,₱ + ¢,£,$,¥,₱ + ¢,$,€,¥,₱ + ¢,$,€,£,¥,₱ + ":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\\\\\|:-\\\\\\\\ ,:\'(|:\'( ,:-D|:-D " + "\\,,\?,!,:,-,\',\",(,),/,;,+,&,\@" + 7 + + ".com" + + ".net,.org,.gov,.edu" + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + ¹,½,⅓,¼,⅛ + ²,⅔ + ³,¾,⅜ + ⁴ + ⅝ + + ⅞ + + + ⁿ,∅ + , + , + \? + ; + % + + + + \@icon/3|\@integer/key_settings + + \@icon/7|\@integer/key_tab + ¿ + + ‰ + \' + - + \" + _ + \" + _ + diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index eb5b749dd..ddc0634f4 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -21,12 +21,12 @@ @dimen/keyboardHeight @fraction/maxKeyboardHeight @fraction/minKeyboardHeight - @xml/kbd_mini_keyboard_template + @xml/kbd_mini_keyboard_template @fraction/keyboard_top_padding @fraction/keyboard_bottom_padding @fraction/key_horizontal_gap @fraction/key_bottom_gap - @integer/config_max_mini_keyboard_column + @integer/config_max_more_keys_column