nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Armenian comma on phone device 

Bug: 7963631
Change-Id: Ia28b4020652174daa2731b3eed7636db9639c6b6
main
Tadashi G. Takaoka 2014-07-08 15:25:45 +09:00
parent c495c5bdcb
commit 1c9e9ecdfb
3 changed files with 77 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
View File

@ -160,29 +160,29 @@ public final class KeyboardTextsTable {
/* 74: 3 */ "keyspec_right_double_angle_quote", /* 74: 3 */ "keyspec_right_double_angle_quote",
/* 75: 3 */ "keyspec_left_single_angle_quote", /* 75: 3 */ "keyspec_left_single_angle_quote",
/* 76: 3 */ "keyspec_right_single_angle_quote", /* 76: 3 */ "keyspec_right_single_angle_quote",
/* 77: 3 */ "morekeys_tablet_comma", /* 77: 3 */ "keyspec_comma",
/* 78: 3 */ "keyhintlabel_period", /* 78: 3 */ "morekeys_tablet_comma",
/* 79: 3 */ "morekeys_tablet_period", /* 79: 3 */ "keyhintlabel_period",
/* 80: 3 */ "morekeys_question", /* 80: 3 */ "morekeys_tablet_period",
/* 81: 2 */ "morekeys_h", /* 81: 3 */ "morekeys_question",
/* 82: 2 */ "morekeys_w", /* 82: 2 */ "morekeys_h",
/* 83: 2 */ "morekeys_east_slavic_row2_2", /* 83: 2 */ "morekeys_w",
/* 84: 2 */ "morekeys_cyrillic_u", /* 84: 2 */ "morekeys_east_slavic_row2_2",
/* 85: 2 */ "morekeys_cyrillic_en", /* 85: 2 */ "morekeys_cyrillic_u",
/* 86: 2 */ "morekeys_cyrillic_ghe", /* 86: 2 */ "morekeys_cyrillic_en",
/* 87: 2 */ "morekeys_cyrillic_o", /* 87: 2 */ "morekeys_cyrillic_ghe",
/* 88: 2 */ "morekeys_cyrillic_i", /* 88: 2 */ "morekeys_cyrillic_o",
/* 89: 2 */ "keyspec_south_slavic_row1_6", /* 89: 2 */ "morekeys_cyrillic_i",
/* 90: 2 */ "keyspec_south_slavic_row2_11", /* 90: 2 */ "keyspec_south_slavic_row1_6",
/* 91: 2 */ "keyspec_south_slavic_row3_1", /* 91: 2 */ "keyspec_south_slavic_row2_11",
/* 92: 2 */ "keyspec_south_slavic_row3_8", /* 92: 2 */ "keyspec_south_slavic_row3_1",
/* 93: 2 */ "morekeys_tablet_punctuation", /* 93: 2 */ "keyspec_south_slavic_row3_8",
/* 94: 2 */ "keyspec_spanish_row2_10", /* 94: 2 */ "morekeys_tablet_punctuation",
/* 95: 2 */ "morekeys_bullet", /* 95: 2 */ "keyspec_spanish_row2_10",
/* 96: 2 */ "morekeys_left_parenthesis", /* 96: 2 */ "morekeys_bullet",
/* 97: 2 */ "morekeys_right_parenthesis", /* 97: 2 */ "morekeys_left_parenthesis",
/* 98: 2 */ "morekeys_arabic_diacritics", /* 98: 2 */ "morekeys_right_parenthesis",
/* 99: 2 */ "keyspec_comma", /* 99: 2 */ "morekeys_arabic_diacritics",
/* 100: 2 */ "keyhintlabel_tablet_comma", /* 100: 2 */ "keyhintlabel_tablet_comma",
/* 101: 2 */ "keyspec_period", /* 101: 2 */ "keyspec_period",
/* 102: 2 */ "morekeys_period", /* 102: 2 */ "morekeys_period",
@ -324,6 +324,8 @@ public final class KeyboardTextsTable {
/* keyspec_right_double_angle_quote */ "\u00BB", /* keyspec_right_double_angle_quote */ "\u00BB",
/* keyspec_left_single_angle_quote */ "\u2039", /* keyspec_left_single_angle_quote */ "\u2039",
/* keyspec_right_single_angle_quote */ "\u203A", /* keyspec_right_single_angle_quote */ "\u203A",
// Comma key
/* keyspec_comma */ ",",
/* morekeys_tablet_comma */ EMPTY, /* morekeys_tablet_comma */ EMPTY,
/* keyhintlabel_period */ EMPTY, /* keyhintlabel_period */ EMPTY,
/* morekeys_tablet_period */ "!text/morekeys_tablet_punctuation", /* morekeys_tablet_period */ "!text/morekeys_tablet_punctuation",
@ -344,8 +346,6 @@ public final class KeyboardTextsTable {
/* morekeys_left_parenthesis */ "!fixedColumnOrder!3,!text/keyspecs_left_parenthesis_more_keys", /* morekeys_left_parenthesis */ "!fixedColumnOrder!3,!text/keyspecs_left_parenthesis_more_keys",
/* morekeys_right_parenthesis */ "!fixedColumnOrder!3,!text/keyspecs_right_parenthesis_more_keys", /* morekeys_right_parenthesis */ "!fixedColumnOrder!3,!text/keyspecs_right_parenthesis_more_keys",
/* morekeys_arabic_diacritics */ EMPTY, /* morekeys_arabic_diacritics */ EMPTY,
// Comma key
/* keyspec_comma */ ",",
/* keyhintlabel_tablet_comma */ EMPTY, /* keyhintlabel_tablet_comma */ EMPTY,
// Period key // Period key
/* keyspec_period */ ".", /* keyspec_period */ ".",
@ -605,6 +605,8 @@ public final class KeyboardTextsTable {
/* keyspec_right_double_angle_quote */ "\u00BB|\u00AB", /* keyspec_right_double_angle_quote */ "\u00BB|\u00AB",
/* keyspec_left_single_angle_quote */ "\u2039|\u203A", /* keyspec_left_single_angle_quote */ "\u2039|\u203A",
/* keyspec_right_single_angle_quote */ "\u203A|\u2039", /* keyspec_right_single_angle_quote */ "\u203A|\u2039",
// U+060C: "،" ARABIC COMMA
/* keyspec_comma */ "\u060C",
/* morekeys_tablet_comma */ "!fixedColumnOrder!4,:,!,\u061F,\u061B,-,\",\'", /* morekeys_tablet_comma */ "!fixedColumnOrder!4,:,!,\u061F,\u061B,-,\",\'",
// U+0651: "ّ" ARABIC SHADDA // U+0651: "ّ" ARABIC SHADDA
/* keyhintlabel_period */ "\u0651", /* keyhintlabel_period */ "\u0651",
@ -639,8 +641,6 @@ public final class KeyboardTextsTable {
// In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. // In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label.
// Note: The space character is needed as a preceding letter to draw Arabic diacritics characters correctly. // Note: The space character is needed as a preceding letter to draw Arabic diacritics characters correctly.
/* morekeys_arabic_diacritics */ "!fixedColumnOrder!7, \u0655|\u0655, \u0654|\u0654, \u0652|\u0652, \u064D|\u064D, \u064C|\u064C, \u064B|\u064B, \u0651|\u0651, \u0656|\u0656, \u0670|\u0670, \u0653|\u0653, \u0650|\u0650, \u064F|\u064F, \u064E|\u064E,\u0640\u0640\u0640|\u0640", /* morekeys_arabic_diacritics */ "!fixedColumnOrder!7, \u0655|\u0655, \u0654|\u0654, \u0652|\u0652, \u064D|\u064D, \u064C|\u064C, \u064B|\u064B, \u0651|\u0651, \u0656|\u0656, \u0670|\u0670, \u0653|\u0653, \u0650|\u0650, \u064F|\u064F, \u064E|\u064E,\u0640\u0640\u0640|\u0640",
// U+060C: "،" ARABIC COMMA
/* keyspec_comma */ "\u060C",
/* keyhintlabel_tablet_comma */ "\u061F", /* keyhintlabel_tablet_comma */ "\u061F",
/* keyspec_period */ null, /* keyspec_period */ null,
/* morekeys_period */ "!text/morekeys_arabic_diacritics", /* morekeys_period */ "!text/morekeys_arabic_diacritics",
@ -839,7 +839,7 @@ public final class KeyboardTextsTable {
/* keyspec_tablet_comma ~ */ /* keyspec_tablet_comma ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ keyspec_south_slavic_row3_8 */ /* ~ keyspec_south_slavic_row3_8 */
/* morekeys_tablet_punctuation */ "!autoColumnOrder!8,\\,,',\u00B7,#,),(,/,;,@,:,-,\",+,\\%,&", /* morekeys_tablet_punctuation */ "!autoColumnOrder!8,\\,,',\u00B7,#,),(,/,;,@,:,-,\",+,\\%,&",
// U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
@ -1242,7 +1242,7 @@ public final class KeyboardTextsTable {
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_question */ /* ~ morekeys_question */
// U+0125: "ĥ" LATIN SMALL LETTER H WITH CIRCUMFLEX // U+0125: "ĥ" LATIN SMALL LETTER H WITH CIRCUMFLEX
// U+0127: "ħ" LATIN SMALL LETTER H WITH STROKE // U+0127: "ħ" LATIN SMALL LETTER H WITH STROKE
@ -1255,7 +1255,7 @@ public final class KeyboardTextsTable {
// U+0135: "ĵ" LATIN SMALL LETTER J WITH CIRCUMFLEX // U+0135: "ĵ" LATIN SMALL LETTER J WITH CIRCUMFLEX
/* keyspec_spanish_row2_10 */ "\u0135", /* keyspec_spanish_row2_10 */ "\u0135",
/* morekeys_bullet ~ */ /* morekeys_bullet ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_symbols_percent */ /* ~ morekeys_symbols_percent */
// U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX // U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX
/* morekeys_v */ "w,\u0175", /* morekeys_v */ "w,\u0175",
@ -1576,6 +1576,8 @@ public final class KeyboardTextsTable {
/* keyspec_right_double_angle_quote */ "\u00BB|\u00AB", /* keyspec_right_double_angle_quote */ "\u00BB|\u00AB",
/* keyspec_left_single_angle_quote */ "\u2039|\u203A", /* keyspec_left_single_angle_quote */ "\u2039|\u203A",
/* keyspec_right_single_angle_quote */ "\u203A|\u2039", /* keyspec_right_single_angle_quote */ "\u203A|\u2039",
// U+060C: "،" ARABIC COMMA
/* keyspec_comma */ "\u060C",
/* morekeys_tablet_comma */ "!fixedColumnOrder!4,:,!,\u061F,\u061B,-,!text/keyspec_left_double_angle_quote,!text/keyspec_right_double_angle_quote", /* morekeys_tablet_comma */ "!fixedColumnOrder!4,:,!,\u061F,\u061B,-,!text/keyspec_left_double_angle_quote,!text/keyspec_right_double_angle_quote",
// U+064B: "ً" ARABIC FATHATAN // U+064B: "ً" ARABIC FATHATAN
/* keyhintlabel_period */ "\u064B", /* keyhintlabel_period */ "\u064B",
@ -1610,8 +1612,6 @@ public final class KeyboardTextsTable {
// In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. // In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label.
// Note: The space character is needed as a preceding letter to draw Arabic diacritics characters correctly. // Note: The space character is needed as a preceding letter to draw Arabic diacritics characters correctly.
/* morekeys_arabic_diacritics */ "!fixedColumnOrder!7, \u0655|\u0655, \u0652|\u0652, \u0651|\u0651, \u064C|\u064C, \u064D|\u064D, \u064B|\u064B, \u0654|\u0654, \u0656|\u0656, \u0670|\u0670, \u0653|\u0653, \u064F|\u064F, \u0650|\u0650, \u064E|\u064E,\u0640\u0640\u0640|\u0640", /* morekeys_arabic_diacritics */ "!fixedColumnOrder!7, \u0655|\u0655, \u0652|\u0652, \u0651|\u0651, \u064C|\u064C, \u064D|\u064D, \u064B|\u064B, \u0654|\u0654, \u0656|\u0656, \u0670|\u0670, \u0653|\u0653, \u064F|\u064F, \u0650|\u0650, \u064E|\u064E,\u0640\u0640\u0640|\u0640",
// U+060C: "،" ARABIC COMMA
/* keyspec_comma */ "\u060C",
/* keyhintlabel_tablet_comma */ "\u061F", /* keyhintlabel_tablet_comma */ "\u061F",
/* keyspec_period */ null, /* keyspec_period */ null,
/* morekeys_period */ "!text/morekeys_arabic_diacritics", /* morekeys_period */ "!text/morekeys_arabic_diacritics",
@ -1982,23 +1982,26 @@ public final class KeyboardTextsTable {
// U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK // U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
// U+055F: "՟" ARMENIAN ABBREVIATION MARK // U+055F: "՟" ARMENIAN ABBREVIATION MARK
/* morekeys_punctuation */ "!autoColumnOrder!8,\\,,\u055E,\u055C,.,\u055A,\u0559,?,!,\u055D,\u055B,\u058A,\u00BB,\u00AB,\u055F,;,:", /* morekeys_punctuation */ "!autoColumnOrder!8,\\,,\u055E,\u055C,.,\u055A,\u0559,?,!,\u055D,\u055B,\u058A,\u00BB,\u00AB,\u055F,;,:",
/* keyspec_tablet_comma */ "\u055D",
/* keyspec_swiss_row1_11 ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null,
/* ~ keyspec_right_single_angle_quote */
// U+058F: "֏" ARMENIAN DRAM SIGN // U+058F: "֏" ARMENIAN DRAM SIGN
// TODO: Enable this when we have glyph for the following letter // TODO: Enable this when we have glyph for the following letter
// <string name="keyspec_currency">&#x058F;</string> // <string name="keyspec_currency">&#x058F;</string>
// //
// U+055D: "՝" ARMENIAN COMMA // U+055D: "՝" ARMENIAN COMMA
/* keyspec_tablet_comma */ "\u055D", /* keyspec_comma */ "\u055D",
/* keyspec_swiss_row1_11 ~ */ /* morekeys_tablet_comma */ null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, /* keyhintlabel_period */ null,
null, null, null, null, null, null, null, null,
/* ~ keyhintlabel_period */
/* morekeys_tablet_period */ "!text/morekeys_punctuation", /* morekeys_tablet_period */ "!text/morekeys_punctuation",
// U+055E: "՞" ARMENIAN QUESTION MARK // U+055E: "՞" ARMENIAN QUESTION MARK
// U+00BF: "¿" INVERTED QUESTION MARK // U+00BF: "¿" INVERTED QUESTION MARK
/* morekeys_question */ "\u055E,\u00BF", /* morekeys_question */ "\u055E,\u00BF",
/* morekeys_h ~ */ /* morekeys_h ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null,
/* ~ keyhintlabel_tablet_comma */ /* ~ keyhintlabel_tablet_comma */
// U+0589: "։" ARMENIAN FULL STOP // U+0589: "։" ARMENIAN FULL STOP
/* keyspec_period */ "\u0589", /* keyspec_period */ "\u0589",
@ -2183,7 +2186,7 @@ public final class KeyboardTextsTable {
/* keyspec_right_double_angle_quote */ "\u00BB|\u00AB", /* keyspec_right_double_angle_quote */ "\u00BB|\u00AB",
/* keyspec_left_single_angle_quote */ "\u2039|\u203A", /* keyspec_left_single_angle_quote */ "\u2039|\u203A",
/* keyspec_right_single_angle_quote */ "\u203A|\u2039", /* keyspec_right_single_angle_quote */ "\u203A|\u2039",
/* morekeys_tablet_comma ~ */ /* keyspec_comma ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
@ -2242,7 +2245,7 @@ public final class KeyboardTextsTable {
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_w */ /* ~ morekeys_w */
// U+0456: "і" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I // U+0456: "і" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
/* morekeys_east_slavic_row2_2 */ "\u0456", /* morekeys_east_slavic_row2_2 */ "\u0456",
@ -2257,7 +2260,7 @@ public final class KeyboardTextsTable {
/* morekeys_cyrillic_o */ "\u04E9", /* morekeys_cyrillic_o */ "\u04E9",
/* morekeys_cyrillic_i ~ */ /* morekeys_cyrillic_i ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ keyspec_x */ /* ~ keyspec_x */
// U+04BB: "һ" CYRILLIC SMALL LETTER SHHA // U+04BB: "һ" CYRILLIC SMALL LETTER SHHA
/* morekeys_east_slavic_row2_11 */ "\u04BB", /* morekeys_east_slavic_row2_11 */ "\u04BB",
@ -2324,7 +2327,7 @@ public final class KeyboardTextsTable {
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_east_slavic_row2_2 */ /* ~ morekeys_east_slavic_row2_2 */
// U+04AF: "ү" CYRILLIC SMALL LETTER STRAIGHT U // U+04AF: "ү" CYRILLIC SMALL LETTER STRAIGHT U
/* morekeys_cyrillic_u */ "\u04AF", /* morekeys_cyrillic_u */ "\u04AF",
@ -2565,7 +2568,7 @@ public final class KeyboardTextsTable {
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_cyrillic_o */ /* ~ morekeys_cyrillic_o */
// U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE // U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE
/* morekeys_cyrillic_i */ "\u045D", /* morekeys_cyrillic_i */ "\u045D",
@ -2671,8 +2674,8 @@ public final class KeyboardTextsTable {
/* keyspec_tablet_comma */ "\u104A", /* keyspec_tablet_comma */ "\u104A",
/* keyspec_swiss_row1_11 ~ */ /* keyspec_swiss_row1_11 ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ keyspec_right_single_angle_quote */ /* ~ keyspec_comma */
/* morekeys_tablet_comma */ "\\,", /* morekeys_tablet_comma */ "\\,",
/* keyhintlabel_period */ "\u104A", /* keyhintlabel_period */ "\u104A",
/* morekeys_tablet_period ~ */ /* morekeys_tablet_period ~ */
@ -2680,7 +2683,7 @@ public final class KeyboardTextsTable {
/* ~ keyspec_south_slavic_row3_8 */ /* ~ keyspec_south_slavic_row3_8 */
/* morekeys_tablet_punctuation */ "!autoColumnOrder!8,.,',#,),(,/,;,@,...,:,-,\",+,\\%,&", /* morekeys_tablet_punctuation */ "!autoColumnOrder!8,.,',#,),(,/,;,@,...,:,-,\",+,\\%,&",
/* keyspec_spanish_row2_10 ~ */ /* keyspec_spanish_row2_10 ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ keyhintlabel_tablet_comma */ /* ~ keyhintlabel_tablet_comma */
/* keyspec_period */ "\u104B", /* keyspec_period */ "\u104B",
/* morekeys_period */ null, /* morekeys_period */ null,
@ -3202,7 +3205,7 @@ public final class KeyboardTextsTable {
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_cyrillic_o */ /* ~ morekeys_cyrillic_o */
// U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE // U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE
/* morekeys_cyrillic_i */ "\u045D", /* morekeys_cyrillic_i */ "\u045D",
@ -3531,7 +3534,7 @@ public final class KeyboardTextsTable {
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_w */ /* ~ morekeys_w */
// U+0457: "ї" CYRILLIC SMALL LETTER YI // U+0457: "ї" CYRILLIC SMALL LETTER YI
/* morekeys_east_slavic_row2_2 */ "\u0457", /* morekeys_east_slavic_row2_2 */ "\u0457",
@ -3799,7 +3802,7 @@ public final class KeyboardTextsTable {
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_question */ /* ~ morekeys_question */
// U+0125: "ĥ" LATIN SMALL LETTER H WITH CIRCUMFLEX // U+0125: "ĥ" LATIN SMALL LETTER H WITH CIRCUMFLEX
/* morekeys_h */ "\u0125", /* morekeys_h */ "\u0125",
@ -3807,7 +3810,7 @@ public final class KeyboardTextsTable {
/* morekeys_w */ "\u0175", /* morekeys_w */ "\u0175",
/* morekeys_east_slavic_row2_2 ~ */ /* morekeys_east_slavic_row2_2 ~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ morekeys_v */ /* ~ morekeys_v */
// U+0135: "ĵ" LATIN SMALL LETTER J WITH CIRCUMFLEX // U+0135: "ĵ" LATIN SMALL LETTER J WITH CIRCUMFLEX
/* morekeys_j */ "\u0135", /* morekeys_j */ "\u0135",
@ -3822,7 +3825,7 @@ public final class KeyboardTextsTable {
"be_BY" , TEXTS_be_BY, /* 9/ 32 Belarusian (Belarus) */ "be_BY" , TEXTS_be_BY, /* 9/ 32 Belarusian (Belarus) */
"bg" , TEXTS_bg, /* 2/ 8 Bulgarian */ "bg" , TEXTS_bg, /* 2/ 8 Bulgarian */
"bn" , TEXTS_bn, /* 2/ 15 Bengali */ "bn" , TEXTS_bn, /* 2/ 15 Bengali */
"ca" , TEXTS_ca, /* 11/ 95 Catalan */ "ca" , TEXTS_ca, /* 11/ 96 Catalan */
"cs" , TEXTS_cs, /* 17/ 21 Czech */ "cs" , TEXTS_cs, /* 17/ 21 Czech */
"da" , TEXTS_da, /* 19/ 54 Danish */ "da" , TEXTS_da, /* 19/ 54 Danish */
"de" , TEXTS_de, /* 16/ 62 German */ "de" , TEXTS_de, /* 16/ 62 German */
@ -3839,18 +3842,18 @@ public final class KeyboardTextsTable {
"hi" , TEXTS_hi, /* 23/ 53 Hindi */ "hi" , TEXTS_hi, /* 23/ 53 Hindi */
"hr" , TEXTS_hr, /* 9/ 20 Croatian */ "hr" , TEXTS_hr, /* 9/ 20 Croatian */
"hu" , TEXTS_hu, /* 9/ 20 Hungarian */ "hu" , TEXTS_hu, /* 9/ 20 Hungarian */
"hy_AM" , TEXTS_hy_AM, /* 8/126 Armenian (Armenia) */ "hy_AM" , TEXTS_hy_AM, /* 9/126 Armenian (Armenia) */
"is" , TEXTS_is, /* 10/ 16 Icelandic */ "is" , TEXTS_is, /* 10/ 16 Icelandic */
"it" , TEXTS_it, /* 11/ 62 Italian */ "it" , TEXTS_it, /* 11/ 62 Italian */
"iw" , TEXTS_iw, /* 20/123 Hebrew */ "iw" , TEXTS_iw, /* 20/123 Hebrew */
"ka_GE" , TEXTS_ka_GE, /* 3/ 10 Georgian (Georgia) */ "ka_GE" , TEXTS_ka_GE, /* 3/ 10 Georgian (Georgia) */
"kk" , TEXTS_kk, /* 15/121 Kazakh */ "kk" , TEXTS_kk, /* 15/121 Kazakh */
"km_KH" , TEXTS_km_KH, /* 2/122 Khmer (Cambodia) */ "km_KH" , TEXTS_km_KH, /* 2/122 Khmer (Cambodia) */
"ky" , TEXTS_ky, /* 10/ 88 Kirghiz */ "ky" , TEXTS_ky, /* 10/ 89 Kirghiz */
"lo_LA" , TEXTS_lo_LA, /* 2/ 15 Lao (Laos) */ "lo_LA" , TEXTS_lo_LA, /* 2/ 15 Lao (Laos) */
"lt" , TEXTS_lt, /* 18/ 22 Lithuanian */ "lt" , TEXTS_lt, /* 18/ 22 Lithuanian */
"lv" , TEXTS_lv, /* 18/ 22 Latvian */ "lv" , TEXTS_lv, /* 18/ 22 Latvian */
"mk" , TEXTS_mk, /* 9/ 93 Macedonian */ "mk" , TEXTS_mk, /* 9/ 94 Macedonian */
"mn_MN" , TEXTS_mn_MN, /* 2/ 15 Mongolian (Mongolia) */ "mn_MN" , TEXTS_mn_MN, /* 2/ 15 Mongolian (Mongolia) */
"mr_IN" , TEXTS_mr_IN, /* 23/ 53 Marathi (India) */ "mr_IN" , TEXTS_mr_IN, /* 23/ 53 Marathi (India) */
"my_MM" , TEXTS_my_MM, /* 8/104 Burmese (Myanmar) */ "my_MM" , TEXTS_my_MM, /* 8/104 Burmese (Myanmar) */
@ -3865,13 +3868,13 @@ public final class KeyboardTextsTable {
"si_LK" , TEXTS_si_LK, /* 1/ 6 Sinhalese (Sri Lanka) */ "si_LK" , TEXTS_si_LK, /* 1/ 6 Sinhalese (Sri Lanka) */
"sk" , TEXTS_sk, /* 20/ 22 Slovak */ "sk" , TEXTS_sk, /* 20/ 22 Slovak */
"sl" , TEXTS_sl, /* 8/ 20 Slovenian */ "sl" , TEXTS_sl, /* 8/ 20 Slovenian */
"sr" , TEXTS_sr, /* 11/ 93 Serbian */ "sr" , TEXTS_sr, /* 11/ 94 Serbian */
"sv" , TEXTS_sv, /* 21/ 54 Swedish */ "sv" , TEXTS_sv, /* 21/ 54 Swedish */
"sw" , TEXTS_sw, /* 9/ 18 Swahili */ "sw" , TEXTS_sw, /* 9/ 18 Swahili */
"th" , TEXTS_th, /* 2/ 15 Thai */ "th" , TEXTS_th, /* 2/ 15 Thai */
"tl" , TEXTS_tl, /* 7/ 9 Tagalog */ "tl" , TEXTS_tl, /* 7/ 9 Tagalog */
"tr" , TEXTS_tr, /* 7/ 18 Turkish */ "tr" , TEXTS_tr, /* 7/ 18 Turkish */
"uk" , TEXTS_uk, /* 11/ 87 Ukrainian */ "uk" , TEXTS_uk, /* 11/ 88 Ukrainian */
"vi" , TEXTS_vi, /* 8/ 15 Vietnamese */ "vi" , TEXTS_vi, /* 8/ 15 Vietnamese */
"zu" , TEXTS_zu, /* 8/ 11 Zulu */ "zu" , TEXTS_zu, /* 8/ 11 Zulu */
"zz" , TEXTS_zz, /* 19/112 Alphabet */ "zz" , TEXTS_zz, /* 19/112 Alphabet */

21
tests/src/com/android/inputmethod/keyboard/layout/ArmenianPhonetic.java
View File

@ -29,7 +29,7 @@ public final class ArmenianPhonetic extends LayoutBase {
private static final String LAYOUT_NAME = "armenian_phonetic"; private static final String LAYOUT_NAME = "armenian_phonetic";
public ArmenianPhonetic(final LayoutCustomizer customizer) { public ArmenianPhonetic(final LayoutCustomizer customizer) {
super(customizer, ArmenianSymbols.class, SymbolsShifted.class); super(customizer, ArmenianSymbols.class, ArmenianSymbolsShifted.class);
} }
@Override @Override
@ -57,16 +57,14 @@ public final class ArmenianPhonetic extends LayoutBase {
@Override @Override
public ExpectedKey[] getKeysLeftToSpacebar(final boolean isPhone) { public ExpectedKey[] getKeysLeftToSpacebar(final boolean isPhone) {
// U+002C: "," COMMA
// U+055D: "՝" ARMENIAN COMMA // U+055D: "՝" ARMENIAN COMMA
return isPhone ? joinKeys(key("\u002C", SETTINGS_KEY)) return isPhone ? joinKeys(key("\u055D", SETTINGS_KEY))
: joinKeys(key("\u055D", SETTINGS_KEY), "_"); : joinKeys(key("\u055D", SETTINGS_KEY), "_");
} }
@Override @Override
public ExpectedKey[] getKeysRightToSpacebar(final boolean isPhone) { public ExpectedKey[] getKeysRightToSpacebar(final boolean isPhone) {
// U+0589: "։" ARMENIAN FULL STOP // U+0589: "։" ARMENIAN FULL STOP
// U+055D: "՝" ARMENIAN COMMA
final ExpectedKey fullStopKey = key("\u0589", getPunctuationMoreKeys(isPhone)); final ExpectedKey fullStopKey = key("\u0589", getPunctuationMoreKeys(isPhone));
return isPhone ? joinKeys(fullStopKey) : joinKeys("/", fullStopKey); return isPhone ? joinKeys(fullStopKey) : joinKeys("/", fullStopKey);
} }
@ -204,6 +202,8 @@ public final class ArmenianPhonetic extends LayoutBase {
public ExpectedKey[][] getLayout(final boolean isPhone) { public ExpectedKey[][] getLayout(final boolean isPhone) {
final ExpectedKeyboardBuilder builder = new ExpectedKeyboardBuilder( final ExpectedKeyboardBuilder builder = new ExpectedKeyboardBuilder(
super.getLayout(isPhone)); super.getLayout(isPhone));
// U+055D: "՝" ARMENIAN COMMA
builder.replaceKeyOfLabel(",", "\u055D");
// U+055C: "՜" ARMENIAN EXCLAMATION MARK // U+055C: "՜" ARMENIAN EXCLAMATION MARK
// U+00A1: "¡" INVERTED EXCLAMATION MARK // U+00A1: "¡" INVERTED EXCLAMATION MARK
// U+055E: "՞" ARMENIAN QUESTION MARK // U+055E: "՞" ARMENIAN QUESTION MARK
@ -213,4 +213,17 @@ public final class ArmenianPhonetic extends LayoutBase {
return builder.build(); return builder.build();
} }
} }
private static final class ArmenianSymbolsShifted extends SymbolsShifted {
public ArmenianSymbolsShifted(final LayoutCustomizer customizer) { super(customizer); }
@Override
public ExpectedKey[][] getLayout(final boolean isPhone) {
final ExpectedKeyboardBuilder builder = new ExpectedKeyboardBuilder(
super.getLayout(isPhone));
// U+055D: "՝" ARMENIAN COMMA
builder.replaceKeyOfLabel(",", "\u055D");
return builder.build();
}
}
} }

1
tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml
View File

@ -45,6 +45,7 @@
<string name="keyspec_currency">&#x058F;</string> <string name="keyspec_currency">&#x058F;</string>
--> -->
<!-- U+055D: "՝" ARMENIAN COMMA --> <!-- U+055D: "՝" ARMENIAN COMMA -->
<string name="keyspec_comma">&#x055D;</string>
<string name="keyspec_tablet_comma">&#x055D;</string> <string name="keyspec_tablet_comma">&#x055D;</string>
<!-- U+0589: "։" ARMENIAN FULL STOP --> <!-- U+0589: "։" ARMENIAN FULL STOP -->
<string name="keyspec_period">&#x0589;</string> <string name="keyspec_period">&#x0589;</string>