Update more keys

This commit is contained in:
Aleksandras Kostarevas 2024-05-08 17:01:34 -05:00
parent 0153d855b9
commit 36157909c7
7 changed files with 50 additions and 32 deletions

View File

@ -24,26 +24,26 @@
<Key <Key
latin:keySpec="!text/keyspec_q" latin:keySpec="!text/keyspec_q"
latin:keyHintLabel="1" latin:keyHintLabel="1"
latin:additionalMoreKeys="1" latin:additionalMoreKeys="1,\\%"
latin:moreKeys="!text/morekeys_q" /> latin:moreKeys="!text/morekeys_q" />
<Key <Key
latin:keySpec="!text/keyspec_w" latin:keySpec="!text/keyspec_w"
latin:keyHintLabel="2" latin:keyHintLabel="2"
latin:additionalMoreKeys="2" latin:additionalMoreKeys="2,\\\\"
latin:moreKeys="!text/morekeys_w" /> latin:moreKeys="!text/morekeys_w" />
<Key <Key
latin:keySpec="e" latin:keySpec="e"
latin:keyHintLabel="3" latin:keyHintLabel="3"
latin:additionalMoreKeys="3" latin:additionalMoreKeys="3,|"
latin:moreKeys="!text/morekeys_e" /> latin:moreKeys="!text/morekeys_e" />
<Key <Key
latin:keySpec="r" latin:keySpec="r"
latin:keyHintLabel="4" latin:keyHintLabel="4"
latin:additionalMoreKeys="4" latin:additionalMoreKeys="4,="
latin:moreKeys="!text/morekeys_r" /> latin:moreKeys="!text/morekeys_r" />
<Key <Key
latin:keySpec="t" latin:keySpec="t"
latin:keyHintLabel="5" latin:keyHintLabel="5"
latin:additionalMoreKeys="5" latin:additionalMoreKeys="5,!text/keyspec_left_square_bracket"
latin:moreKeys="!text/morekeys_t" /> latin:moreKeys="!text/morekeys_t" />
</merge> </merge>

View File

@ -24,25 +24,25 @@
<Key <Key
latin:keySpec="!text/keyspec_y" latin:keySpec="!text/keyspec_y"
latin:keyHintLabel="6" latin:keyHintLabel="6"
latin:additionalMoreKeys="6" latin:additionalMoreKeys="6,!text/keyspec_right_square_bracket"
latin:moreKeys="!text/morekeys_y" /> latin:moreKeys="!text/morekeys_y" />
<Key <Key
latin:keySpec="u" latin:keySpec="u"
latin:keyHintLabel="7" latin:keyHintLabel="7"
latin:additionalMoreKeys="7" latin:additionalMoreKeys="7,!text/keyspec_less_than"
latin:moreKeys="!text/morekeys_u" /> latin:moreKeys="!text/morekeys_u" />
<Key <Key
latin:keySpec="i" latin:keySpec="i"
latin:keyHintLabel="8" latin:keyHintLabel="8"
latin:additionalMoreKeys="8" latin:additionalMoreKeys="8,!text/keyspec_greater_than"
latin:moreKeys="!text/morekeys_i" /> latin:moreKeys="!text/morekeys_i" />
<Key <Key
latin:keySpec="o" latin:keySpec="o"
latin:keyHintLabel="9" latin:keyHintLabel="9"
latin:additionalMoreKeys="9" latin:additionalMoreKeys="9,!text/keyspec_left_curly_bracket"
latin:moreKeys="!text/morekeys_o" /> latin:moreKeys="!text/morekeys_o" />
<Key <Key
latin:keySpec="p" latin:keySpec="p"
latin:keyHintLabel="0" latin:keyHintLabel="0"
latin:additionalMoreKeys="0" /> latin:additionalMoreKeys="0,!text/keyspec_right_curly_bracket" />
</merge> </merge>

View File

@ -32,6 +32,6 @@
latin:moreKeys="!text/morekeys_n" /> latin:moreKeys="!text/morekeys_n" />
<Key <Key
latin:keySpec="m" latin:keySpec="m"
latin:keyHintLabel="?" latin:keyHintLabel="\?"
latin:additionalMoreKeys="?,/" /> latin:additionalMoreKeys="\?,/" />
</merge> </merge>

View File

@ -22,51 +22,52 @@
xmlns:latin="http://schemas.android.com/apk/res-auto" xmlns:latin="http://schemas.android.com/apk/res-auto"
> >
<Key <Key
latin:keySpec="q" latin:keySpec="!text/keyspec_q"
latin:keyHintLabel="1" latin:keyHintLabel="1"
latin:additionalMoreKeys="1" /> latin:additionalMoreKeys="1,\\%"
latin:moreKeys="!text/morekeys_q" />
<Key <Key
latin:keySpec="w" latin:keySpec="!text/keyspec_w"
latin:keyHintLabel="2" latin:keyHintLabel="2"
latin:additionalMoreKeys="2" latin:additionalMoreKeys="2,\\\\"
latin:moreKeys="!text/morekeys_w" /> latin:moreKeys="!text/morekeys_w" />
<Key <Key
latin:keySpec="e" latin:keySpec="e"
latin:keyHintLabel="3" latin:keyHintLabel="3"
latin:additionalMoreKeys="3" latin:additionalMoreKeys="3,|"
latin:moreKeys="!text/morekeys_e" /> latin:moreKeys="!text/morekeys_e" />
<Key <Key
latin:keySpec="r" latin:keySpec="r"
latin:keyHintLabel="4" latin:keyHintLabel="4"
latin:additionalMoreKeys="4" latin:additionalMoreKeys="4,="
latin:moreKeys="!text/morekeys_r" /> latin:moreKeys="!text/morekeys_r" />
<Key <Key
latin:keySpec="t" latin:keySpec="t"
latin:keyHintLabel="5" latin:keyHintLabel="5"
latin:additionalMoreKeys="5" latin:additionalMoreKeys="5,!text/keyspec_left_square_bracket"
latin:moreKeys="!text/morekeys_t" /> latin:moreKeys="!text/morekeys_t" />
<Key <Key
latin:keySpec="z" latin:keySpec="z"
latin:keyHintLabel="6" latin:keyHintLabel="6"
latin:additionalMoreKeys="6" latin:additionalMoreKeys="6,!text/keyspec_right_square_bracket"
latin:moreKeys="!text/morekeys_z" /> latin:moreKeys="!text/morekeys_z" />
<Key <Key
latin:keySpec="u" latin:keySpec="u"
latin:keyHintLabel="7" latin:keyHintLabel="7"
latin:additionalMoreKeys="7" latin:additionalMoreKeys="7,!text/keyspec_less_than"
latin:moreKeys="!text/morekeys_u" /> latin:moreKeys="!text/morekeys_u" />
<Key <Key
latin:keySpec="i" latin:keySpec="i"
latin:keyHintLabel="8" latin:keyHintLabel="8"
latin:additionalMoreKeys="8" latin:additionalMoreKeys="8,!text/keyspec_greater_than"
latin:moreKeys="!text/morekeys_i" /> latin:moreKeys="!text/morekeys_i" />
<Key <Key
latin:keySpec="o" latin:keySpec="o"
latin:keyHintLabel="9" latin:keyHintLabel="9"
latin:additionalMoreKeys="9" latin:additionalMoreKeys="9,!text/keyspec_left_curly_bracket"
latin:moreKeys="!text/morekeys_o" /> latin:moreKeys="!text/morekeys_o" />
<Key <Key
latin:keySpec="p" latin:keySpec="p"
latin:keyHintLabel="0" latin:keyHintLabel="0"
latin:additionalMoreKeys="0" /> latin:additionalMoreKeys="0,!text/keyspec_right_curly_bracket" />
</merge> </merge>

View File

@ -23,20 +23,35 @@
> >
<Key <Key
latin:keySpec="y" latin:keySpec="y"
latin:keyHintLabel="*"
latin:additionalMoreKeys="*"
latin:moreKeys="!text/morekeys_y" /> latin:moreKeys="!text/morekeys_y" />
<Key <Key
latin:keySpec="x" /> latin:keySpec="x"
latin:keyHintLabel="&quot;"
latin:additionalMoreKeys="&quot;"
latin:moreKeys="!text/morekeys_x" />
<Key <Key
latin:keySpec="c" latin:keySpec="c"
latin:keyHintLabel="'"
latin:additionalMoreKeys="'"
latin:moreKeys="!text/morekeys_c" /> latin:moreKeys="!text/morekeys_c" />
<Key <Key
latin:keySpec="v" latin:keySpec="v"
latin:keyHintLabel=":"
latin:additionalMoreKeys=":"
latin:moreKeys="!text/morekeys_v" /> latin:moreKeys="!text/morekeys_v" />
<Key <Key
latin:keySpec="b" /> latin:keySpec="b"
latin:keyHintLabel=";"
latin:additionalMoreKeys=";" />
<Key <Key
latin:keySpec="n" latin:keySpec="n"
latin:keyHintLabel="!"
latin:additionalMoreKeys="!"
latin:moreKeys="!text/morekeys_n" /> latin:moreKeys="!text/morekeys_n" />
<Key <Key
latin:keySpec="m" /> latin:keySpec="m"
latin:keyHintLabel="\?"
latin:additionalMoreKeys="\?,/" />
</merge> </merge>

View File

@ -376,7 +376,9 @@ public class Key implements Comparable<Key> {
} }
if(moreKeys != null && moreKeys.length > 0) { if(moreKeys != null && moreKeys.length > 0) {
final String hintLabelCandidate = moreKeys[0]; String hintLabelCandidate = moreKeys[0];
if(hintLabelCandidate.startsWith("\\")) hintLabelCandidate = hintLabelCandidate.substring(1);
if(hintLabelCandidate.length() == 1) { if(hintLabelCandidate.length() == 1) {
hintLabel = hintLabelCandidate; hintLabel = hintLabelCandidate;
} }

View File

@ -302,7 +302,7 @@ public final class KeyboardTextsTable {
/* ~ additional_morekeys_symbols_0 */ /* ~ additional_morekeys_symbols_0 */
/* morekeys_tablet_period */ "!text/morekeys_tablet_punctuation", /* morekeys_tablet_period */ "!text/morekeys_tablet_punctuation",
/* morekeys_nordic_row2_11 */ EMPTY, /* morekeys_nordic_row2_11 */ EMPTY,
/* morekeys_punctuation */ "_,\\\\,|,=", /* morekeys_punctuation */ "?,!,\u203d,\u2026,_,\\\\,|,=",
/* keyspec_tablet_comma */ ",", /* keyspec_tablet_comma */ ",",
// Period key // Period key
/* keyspec_period */ ".", /* keyspec_period */ ".",
@ -342,7 +342,7 @@ public final class KeyboardTextsTable {
/* morekeys_tablet_comma */ EMPTY, /* morekeys_tablet_comma */ EMPTY,
/* keyhintlabel_period */ EMPTY, /* keyhintlabel_period */ EMPTY,
// U+00BF: "¿" INVERTED QUESTION MARK // U+00BF: "¿" INVERTED QUESTION MARK
/* morekeys_question */ "\u00BF", /* morekeys_question */ "\u00BF,\u203d",
/* morekeys_h ~ */ /* morekeys_h ~ */
EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
/* ~ keyspec_south_slavic_row3_8 */ /* ~ keyspec_south_slavic_row3_8 */
@ -395,7 +395,7 @@ public final class KeyboardTextsTable {
/* morekeys_less_than */ "!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_left_double_angle_quote", /* morekeys_less_than */ "!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_left_double_angle_quote",
/* morekeys_greater_than */ "!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_right_double_angle_quote", /* morekeys_greater_than */ "!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_right_double_angle_quote",
// U+00A1: "¡" INVERTED EXCLAMATION MARK // U+00A1: "¡" INVERTED EXCLAMATION MARK
/* morekeys_exclamation */ "\u00A1", /* morekeys_exclamation */ "\u00A1,\u203d",
/* morekeys_currency_generic */ "$,\u00A2,\u20AC,\u00A3,\u00A5,\u20B1", /* morekeys_currency_generic */ "$,\u00A2,\u20AC,\u00A3,\u00A5,\u20B1",
// U+00B9: "¹" SUPERSCRIPT ONE // U+00B9: "¹" SUPERSCRIPT ONE
// U+00BD: "½" VULGAR FRACTION ONE HALF // U+00BD: "½" VULGAR FRACTION ONE HALF