Fix Armenian punctuation order
Bug: 12623502
Change-Id: I6cc026132922e103d212b663664e7e0aa2404b35
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
index 2ac51de..5c03e41 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
@@ -1953,15 +1953,17 @@
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null,
/* ~ more_keys_for_cyrillic_soft_sign */
- // U+058A: "֊" ARMENIAN HYPHEN
- // U+055C: "՜" ARMENIAN EXCLAMATION MARK
- // U+055D: "՝" ARMENIAN COMMA
// U+055E: "՞" ARMENIAN QUESTION MARK
- // U+0559: "ՙ" ARMENIAN MODIFIER LETTER LEFT HALF RING
+ // U+055C: "՜" ARMENIAN EXCLAMATION MARK
// U+055A: "՚" ARMENIAN APOSTROPHE
+ // U+0559: "ՙ" ARMENIAN MODIFIER LETTER LEFT HALF RING
+ // U+055D: "՝" ARMENIAN COMMA
// U+055B: "՛" ARMENIAN EMPHASIS MARK
+ // U+058A: "֊" ARMENIAN HYPHEN
+ // U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+ // U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
// U+055F: "՟" ARMENIAN ABBREVIATION MARK
- /* more_keys_for_punctuation */ "!fixedColumnOrder!8,!,?,\u0559,\u055A,.,\u055C,\\,,\u055E,:,;,\u055F,\u00AB,\u00BB,\u058A,\u055D,\u055B",
+ /* more_keys_for_punctuation */ "!autoColumnOrder!8,\\,,\u055E,\u055C,.,\u055A,\u0559,?,!,\u055D,\u055B,\u058A,\u00BB,\u00AB,\u055F,;,:",
/* more_keys_for_nordic_row2_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,
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/ArmenianPhonetic.java b/tests/src/com/android/inputmethod/keyboard/layout/ArmenianPhonetic.java
index 3ed7603..204bb01 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/ArmenianPhonetic.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/ArmenianPhonetic.java
@@ -74,19 +74,19 @@
private static final ExpectedKey ARMENIAN_ALPHABET_KEY = key(
"\u0531\u0532\u0533", Constants.CODE_SWITCH_ALPHA_SYMBOL);
- // U+0559: "ՙ" ARMENIAN MODIFIER LETTER LEFT HALF RING
- // U+055A: "՚" ARMENIAN APOSTROPHE
- // U+055C: "՜" ARMENIAN EXCLAMATION MARK
// U+055E: "՞" ARMENIAN QUESTION MARK
- // U+055F: "՟" ARMENIAN ABBREVIATION MARK
- // U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
- // U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
- // U+058A: "֊" ARMENIAN HYPHEN
+ // U+055C: "՜" ARMENIAN EXCLAMATION MARK
+ // U+055A: "՚" ARMENIAN APOSTROPHE
+ // U+0559: "ՙ" ARMENIAN MODIFIER LETTER LEFT HALF RING
// U+055D: "՝" ARMENIAN COMMA
// U+055B: "՛" ARMENIAN EMPHASIS MARK
+ // U+058A: "֊" ARMENIAN HYPHEN
+ // U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+ // U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+ // U+055F: "՟" ARMENIAN ABBREVIATION MARK
private static final ExpectedKey[] ARMENIAN_PUNCTUATION_MORE_KEYS = joinMoreKeys(
- "!", "?", "\u0559", "\u055A", ".", "\u055C", ",", "\u055E",
- ":", ";", "\u055F", "\u00AB", "\u00BB", "\u058A", "\u055D", "\u055B");
+ ",", "\u055E", "\u055C", ".", "\u055A", "\u0559", "?", "!",
+ "\u055D", "\u055B", "\u058A", "\u00BB", "\u00AB", "\u055F", ";", ":");
}
@Override
diff --git a/tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml
index a17dc10..8ab78d0 100644
--- a/tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml
@@ -23,20 +23,22 @@
U+0532: "Բ" ARMENIAN CAPITAL LETTER BEN
U+0533: "Գ" ARMENIAN CAPITAL LETTER GIM -->
<string name="label_to_alpha_key">ԱԲԳ</string>
- <!-- U+058A: "֊" ARMENIAN HYPHEN -->
- <!-- U+055C: "՜" ARMENIAN EXCLAMATION MARK -->
- <!-- U+055D: "՝" ARMENIAN COMMA -->
- <!-- U+055E: "՞" ARMENIAN QUESTION MARK -->
- <!-- U+0559: "ՙ" ARMENIAN MODIFIER LETTER LEFT HALF RING -->
- <!-- U+055A: "՚" ARMENIAN APOSTROPHE -->
- <!-- U+055B: "՛" ARMENIAN EMPHASIS MARK -->
- <!-- U+055F: "՟" ARMENIAN ABBREVIATION MARK -->
- <string name="more_keys_for_punctuation">"!fixedColumnOrder!8,!,?,ՙ,՚,.,՜,\\,,՞,:,;,՟,«,»,֊,՝,՛"</string>
- <!-- U+055E: "՞" ARMENIAN QUESTION MARK -->
- <!-- U+00BF: "¿" INVERTED QUESTION MARK -->
+ <!-- U+055E: "՞" ARMENIAN QUESTION MARK
+ U+055C: "՜" ARMENIAN EXCLAMATION MARK
+ U+055A: "՚" ARMENIAN APOSTROPHE
+ U+0559: "ՙ" ARMENIAN MODIFIER LETTER LEFT HALF RING
+ U+055D: "՝" ARMENIAN COMMA
+ U+055B: "՛" ARMENIAN EMPHASIS MARK
+ U+058A: "֊" ARMENIAN HYPHEN
+ U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+ U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+ U+055F: "՟" ARMENIAN ABBREVIATION MARK -->
+ <string name="more_keys_for_punctuation">"!autoColumnOrder!8,\\,,՞,՜,.,՚,ՙ,?,!,՝,՛,֊,»,«,՟,;,:"</string>
+ <!-- U+055E: "՞" ARMENIAN QUESTION MARK
+ U+00BF: "¿" INVERTED QUESTION MARK -->
<string name="more_keys_for_question">՞,¿</string>
- <!-- U+055C: "՜" ARMENIAN EXCLAMATION MARK -->
- <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
+ <!-- U+055C: "՜" ARMENIAN EXCLAMATION MARK
+ U+00A1: "¡" INVERTED EXCLAMATION MARK -->
<string name="more_keys_for_exclamation">՜,¡</string>
<!-- U+058F: "֏" ARMENIAN DRAM SIGN -->
<!-- TODO: Enable this when we have glyph for the following letter