diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Azerty.java b/tests/src/com/android/inputmethod/keyboard/layout/Azerty.java
index eaa25823fcfeb7decd554952104bd07b5f92f868..a0949637b75089fe0ccfb96db718889ba884bbf4 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Azerty.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Azerty.java
@@ -61,16 +61,16 @@ public final class Azerty extends LayoutBase {
private static final ExpectedKey[][] ALPHABET_COMMON = new ExpectedKeyboardBuilder()
.setKeysOfRow(1,
- key("a", moreKey("1")),
- key("z", moreKey("2")),
- key("e", moreKey("3")),
- key("r", moreKey("4")),
- key("t", moreKey("5")),
- key("y", moreKey("6")),
- key("u", moreKey("7")),
- key("i", moreKey("8")),
- key("o", moreKey("9")),
- key("p", moreKey("0")))
+ key("a", additionalMoreKey("1")),
+ key("z", additionalMoreKey("2")),
+ key("e", additionalMoreKey("3")),
+ key("r", additionalMoreKey("4")),
+ key("t", additionalMoreKey("5")),
+ key("y", additionalMoreKey("6")),
+ key("u", additionalMoreKey("7")),
+ key("i", additionalMoreKey("8")),
+ key("o", additionalMoreKey("9")),
+ key("p", additionalMoreKey("0")))
.setKeysOfRow(2, "q", "s", "d", "f", "g", "h", "j", "k", "l", "m")
.setKeysOfRow(3, "w", "x", "c", "v", "b", "n", ROW3_QUOTE)
.build();
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Bulgarian.java b/tests/src/com/android/inputmethod/keyboard/layout/Bulgarian.java
index 0972cc12fd3aec967595b63c54e3ae3f8139742e..3282e44ae1eed2e769fbacc20808d253ee93801a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Bulgarian.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Bulgarian.java
@@ -77,29 +77,29 @@ public final class Bulgarian extends LayoutBase {
key("\u043F", moreKey("0")),
// U+0447: "ч" CYRILLIC SMALL LETTER CHE
"\u0447")
- // U+0430: "а" CYRILLIC SMALL LETTER A
- // U+0441: "Ñ" CYRILLIC SMALL LETTER ES
- // U+0434: "д" CYRILLIC SMALL LETTER DE
- // U+0444: "Ñ„" CYRILLIC SMALL LETTER EF
- // U+0433: "г" CYRILLIC SMALL LETTER GHE
- // U+0445: "Ñ…" CYRILLIC SMALL LETTER HA
- // U+0439: "й" CYRILLIC SMALL LETTER SHORT I
- // U+043A: "к" CYRILLIC SMALL LETTER KA
- // U+043B: "л" CYRILLIC SMALL LETTER EL
- // U+0448: "ш" CYRILLIC SMALL LETTER SHA
- // U+0449: "щ" CYRILLIC SMALL LETTER SHCHA
.setKeysOfRow(2,
+ // U+0430: "а" CYRILLIC SMALL LETTER A
+ // U+0441: "Ñ" CYRILLIC SMALL LETTER ES
+ // U+0434: "д" CYRILLIC SMALL LETTER DE
+ // U+0444: "Ñ„" CYRILLIC SMALL LETTER EF
+ // U+0433: "г" CYRILLIC SMALL LETTER GHE
+ // U+0445: "Ñ…" CYRILLIC SMALL LETTER HA
+ // U+0439: "й" CYRILLIC SMALL LETTER SHORT I
+ // U+043A: "к" CYRILLIC SMALL LETTER KA
+ // U+043B: "л" CYRILLIC SMALL LETTER EL
+ // U+0448: "ш" CYRILLIC SMALL LETTER SHA
+ // U+0449: "щ" CYRILLIC SMALL LETTER SHCHA
"\u0430", "\u0441", "\u0434", "\u0444", "\u0433", "\u0445", "\u0439", "\u043A",
"\u043B", "\u0448", "\u0449")
- // U+0437: "з" CYRILLIC SMALL LETTER ZE
- // U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN
- // U+0446: "ц" CYRILLIC SMALL LETTER TSE
- // U+0436: "ж" CYRILLIC SMALL LETTER ZHE
- // U+0431: "б" CYRILLIC SMALL LETTER BE
- // U+043D: "н" CYRILLIC SMALL LETTER EN
- // U+043C: "м" CYRILLIC SMALL LETTER EM
- // U+044E: "ÑŽ" CYRILLIC SMALL LETTER YU
.setKeysOfRow(3,
+ // U+0437: "з" CYRILLIC SMALL LETTER ZE
+ // U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN
+ // U+0446: "ц" CYRILLIC SMALL LETTER TSE
+ // U+0436: "ж" CYRILLIC SMALL LETTER ZHE
+ // U+0431: "б" CYRILLIC SMALL LETTER BE
+ // U+043D: "н" CYRILLIC SMALL LETTER EN
+ // U+043C: "м" CYRILLIC SMALL LETTER EM
+ // U+044E: "ÑŽ" CYRILLIC SMALL LETTER YU
"\u0437", "\u044C", "\u0446", "\u0436", "\u0431", "\u043D", "\u043C", "\u044E")
.build();
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/BulgarianBds.java b/tests/src/com/android/inputmethod/keyboard/layout/BulgarianBds.java
index f8de93491f21f2bffa785a1b4b050a85de10b5da..20a5f7dac0390ebbe562bfd564fcaa9a0d5300c3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/BulgarianBds.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/BulgarianBds.java
@@ -67,30 +67,30 @@ public final class BulgarianBds extends LayoutBase {
key("\u0446", moreKey("0")),
// U+0431: "б" CYRILLIC SMALL LETTER BE
"\u0431")
- // U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN
- // U+044F: "Ñ" CYRILLIC SMALL LETTER YA
- // U+0430: "а" CYRILLIC SMALL LETTER A
- // U+043E: "о" CYRILLIC SMALL LETTER O
- // U+0436: "ж" CYRILLIC SMALL LETTER ZHE
- // U+0433: "г" CYRILLIC SMALL LETTER GHE
- // U+0442: "Ñ‚" CYRILLIC SMALL LETTER TE
- // U+043D: "н" CYRILLIC SMALL LETTER EN
- // U+0432: "в" CYRILLIC SMALL LETTER VE
- // U+043C: "м" CYRILLIC SMALL LETTER EM
- // U+0447: "ч" CYRILLIC SMALL LETTER CHE
.setKeysOfRow(2,
+ // U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN
+ // U+044F: "Ñ" CYRILLIC SMALL LETTER YA
+ // U+0430: "а" CYRILLIC SMALL LETTER A
+ // U+043E: "о" CYRILLIC SMALL LETTER O
+ // U+0436: "ж" CYRILLIC SMALL LETTER ZHE
+ // U+0433: "г" CYRILLIC SMALL LETTER GHE
+ // U+0442: "Ñ‚" CYRILLIC SMALL LETTER TE
+ // U+043D: "н" CYRILLIC SMALL LETTER EN
+ // U+0432: "в" CYRILLIC SMALL LETTER VE
+ // U+043C: "м" CYRILLIC SMALL LETTER EM
+ // U+0447: "ч" CYRILLIC SMALL LETTER CHE
"\u044C", "\u044F", "\u0430", "\u043E", "\u0436", "\u0433", "\u0442", "\u043D",
"\u0432", "\u043C", "\u0447")
- // U+044E: "ÑŽ" CYRILLIC SMALL LETTER YU
- // U+0439: "й" CYRILLIC SMALL LETTER SHORT I
- // U+044A: "ÑŠ" CYRILLIC SMALL LETTER HARD SIGN
- // U+044D: "Ñ" CYRILLIC SMALL LETTER E
- // U+0444: "Ñ„" CYRILLIC SMALL LETTER EF
- // U+0445: "Ñ…" CYRILLIC SMALL LETTER HA
- // U+043F: "п" CYRILLIC SMALL LETTER PE
- // U+0440: "Ñ€" CYRILLIC SMALL LETTER ER
- // U+043B: "л" CYRILLIC SMALL LETTER EL
.setKeysOfRow(3,
+ // U+044E: "ÑŽ" CYRILLIC SMALL LETTER YU
+ // U+0439: "й" CYRILLIC SMALL LETTER SHORT I
+ // U+044A: "ÑŠ" CYRILLIC SMALL LETTER HARD SIGN
+ // U+044D: "Ñ" CYRILLIC SMALL LETTER E
+ // U+0444: "Ñ„" CYRILLIC SMALL LETTER EF
+ // U+0445: "Ñ…" CYRILLIC SMALL LETTER HA
+ // U+043F: "п" CYRILLIC SMALL LETTER PE
+ // U+0440: "Ñ€" CYRILLIC SMALL LETTER ER
+ // U+043B: "л" CYRILLIC SMALL LETTER EL
"\u044E", "\u0439", "\u044A", "\u044D", "\u0444", "\u0445", "\u043F", "\u0440",
"\u043B")
.build();
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/EastSlavic.java b/tests/src/com/android/inputmethod/keyboard/layout/EastSlavic.java
index f6de53fa717fb512423b4856f40a1afd07c14a01..7fcc974c2a03b9ab5a48e26c88af3c0d03f65fee 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/EastSlavic.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/EastSlavic.java
@@ -63,47 +63,47 @@ public final class EastSlavic extends LayoutBase {
private static final ExpectedKey[][] ALPHABET_COMMON = new ExpectedKeyboardBuilder()
.setKeysOfRow(1,
// U+0443: "у" CYRILLIC SMALL LETTER U
- key("\u0439", moreKey("1")),
+ key("\u0439", additionalMoreKey("1")),
// U+0446: "ц" CYRILLIC SMALL LETTER TSE
- key("\u0446", moreKey("2")),
+ key("\u0446", additionalMoreKey("2")),
// U+0439: "й" CYRILLIC SMALL LETTER SHORT I
- key("\u0443", moreKey("3")),
+ key("\u0443", additionalMoreKey("3")),
// U+043A: "к" CYRILLIC SMALL LETTER KA
- key("\u043A", moreKey("4")),
+ key("\u043A", additionalMoreKey("4")),
// U+0435: "е" CYRILLIC SMALL LETTER IE
- key("\u0435", moreKey("5")),
+ key("\u0435", additionalMoreKey("5")),
// U+043D: "н" CYRILLIC SMALL LETTER EN
- key("\u043D", moreKey("6")),
+ key("\u043D", additionalMoreKey("6")),
// U+0433: "г" CYRILLIC SMALL LETTER GHE
- key("\u0433", moreKey("7")),
+ key("\u0433", additionalMoreKey("7")),
// U+0448: "ш" CYRILLIC SMALL LETTER SHA
- key("\u0448", moreKey("8")),
- key(ROW1_9, moreKey("9")),
+ key("\u0448", additionalMoreKey("8")),
+ key(ROW1_9, additionalMoreKey("9")),
// U+0437: "з" CYRILLIC SMALL LETTER ZE
- key("\u0437", moreKey("0")),
+ key("\u0437", additionalMoreKey("0")),
// U+0445: "Ñ…" CYRILLIC SMALL LETTER HA
"\u0445")
- // U+0444: "Ñ„" CYRILLIC SMALL LETTER EF
- // U+0432: "в" CYRILLIC SMALL LETTER VE
- // U+0430: "а" CYRILLIC SMALL LETTER A
- // U+043F: "п" CYRILLIC SMALL LETTER PE
- // U+0440: "Ñ€" CYRILLIC SMALL LETTER ER
- // U+043E: "о" CYRILLIC SMALL LETTER O
- // U+043B: "л" CYRILLIC SMALL LETTER EL
- // U+0434: "д" CYRILLIC SMALL LETTER DE
- // U+0436: "ж" CYRILLIC SMALL LETTER ZHE
.setKeysOfRow(2,
+ // U+0444: "Ñ„" CYRILLIC SMALL LETTER EF
+ // U+0432: "в" CYRILLIC SMALL LETTER VE
+ // U+0430: "а" CYRILLIC SMALL LETTER A
+ // U+043F: "п" CYRILLIC SMALL LETTER PE
+ // U+0440: "Ñ€" CYRILLIC SMALL LETTER ER
+ // U+043E: "о" CYRILLIC SMALL LETTER O
+ // U+043B: "л" CYRILLIC SMALL LETTER EL
+ // U+0434: "д" CYRILLIC SMALL LETTER DE
+ // U+0436: "ж" CYRILLIC SMALL LETTER ZHE
"\u0444", ROW2_2, "\u0432", "\u0430", "\u043F", "\u0440", "\u043E", "\u043B",
"\u0434", "\u0436", ROW2_11)
- // U+044F: "Ñ" CYRILLIC SMALL LETTER YA
- // U+0447: "ч" CYRILLIC SMALL LETTER CHE
- // U+0441: "Ñ" CYRILLIC SMALL LETTER ES
- // U+043C: "м" CYRILLIC SMALL LETTER EM
- // U+0442: "Ñ‚" CYRILLIC SMALL LETTER TE
- // U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN
- // U+0431: "б" CYRILLIC SMALL LETTER BE
- // U+044E: "ÑŽ" CYRILLIC SMALL LETTER YU
.setKeysOfRow(3,
+ // U+044F: "Ñ" CYRILLIC SMALL LETTER YA
+ // U+0447: "ч" CYRILLIC SMALL LETTER CHE
+ // U+0441: "Ñ" CYRILLIC SMALL LETTER ES
+ // U+043C: "м" CYRILLIC SMALL LETTER EM
+ // U+0442: "Ñ‚" CYRILLIC SMALL LETTER TE
+ // U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN
+ // U+0431: "б" CYRILLIC SMALL LETTER BE
+ // U+044E: "ÑŽ" CYRILLIC SMALL LETTER YU
"\u044F", "\u0447", "\u0441", "\u043C", ROW3_5, "\u0442", "\u044C", "\u0431",
"\u044E")
.build();
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Greek.java b/tests/src/com/android/inputmethod/keyboard/layout/Greek.java
index 1a71fad95210f20f71716f1b7cae54736680f1f7..0ec9f4cf47df4ce1614811868c1a07efa8a8b386 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Greek.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Greek.java
@@ -36,7 +36,7 @@ public final class Greek extends LayoutBase {
@Override
public String getName() { return LAYOUT_NAME; }
- public static class GreekCustomizer extends EuroLayoutCustomizer {
+ public static class GreekCustomizer extends EuroCustomizer {
public GreekCustomizer(final Locale locale) { super(locale); }
@Override
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/LayoutBase.java b/tests/src/com/android/inputmethod/keyboard/layout/LayoutBase.java
index 256a0d1a5b428ef90976f68a7d6a39ec4ba84506..d870931ac22188c7e5ad9d946fd51a0f0403e220 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/LayoutBase.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/LayoutBase.java
@@ -188,8 +188,8 @@ public abstract class LayoutBase extends AbstractLayoutBase {
/**
* The layout customize class for countries that use Euro.
*/
- public static class EuroLayoutCustomizer extends LayoutCustomizer {
- public EuroLayoutCustomizer(final Locale locale) {
+ public static class EuroCustomizer extends LayoutCustomizer {
+ public EuroCustomizer(final Locale locale) {
super(locale);
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Nordic.java b/tests/src/com/android/inputmethod/keyboard/layout/Nordic.java
index cee7eee8d2f19d6cd2cf76ef7b2f225168fda6f8..c791c404dcbc0f05d124488e1742fc1192a7965e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Nordic.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Nordic.java
@@ -41,16 +41,16 @@ public final class Nordic extends LayoutBase {
private static final ExpectedKey[][] ALPHABET_COMMON = new ExpectedKeyboardBuilder()
.setKeysOfRow(1,
- key("q", moreKey("1")),
- key("w", moreKey("2")),
- key("e", moreKey("3")),
- key("r", moreKey("4")),
- key("t", moreKey("5")),
- key("y", moreKey("6")),
- key("u", moreKey("7")),
- key("i", moreKey("8")),
- key("o", moreKey("9")),
- key("p", moreKey("0")),
+ key("q", additionalMoreKey("1")),
+ key("w", additionalMoreKey("2")),
+ key("e", additionalMoreKey("3")),
+ key("r", additionalMoreKey("4")),
+ key("t", additionalMoreKey("5")),
+ key("y", additionalMoreKey("6")),
+ key("u", additionalMoreKey("7")),
+ key("i", additionalMoreKey("8")),
+ key("o", additionalMoreKey("9")),
+ key("p", additionalMoreKey("0")),
ROW1_11)
.setKeysOfRow(2, "a", "s", "d", "f", "g", "h", "j", "k", "l", ROW2_10, ROW2_11)
.setKeysOfRow(3, "z", "x", "c", "v", "b", "n", "m")
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Qwerty.java b/tests/src/com/android/inputmethod/keyboard/layout/Qwerty.java
index 7ede74cef762144f6eb7dde7e583bd0896803a09..d790a1e53bc911cfdb3177cca482575d4443b999 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Qwerty.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Qwerty.java
@@ -37,16 +37,16 @@ public final class Qwerty extends LayoutBase {
private static final ExpectedKey[][] ALPHABET_COMMON = new ExpectedKeyboardBuilder()
.setKeysOfRow(1,
- key("q", moreKey("1")),
- key("w", moreKey("2")),
- key("e", moreKey("3")),
- key("r", moreKey("4")),
- key("t", moreKey("5")),
- key("y", moreKey("6")),
- key("u", moreKey("7")),
- key("i", moreKey("8")),
- key("o", moreKey("9")),
- key("p", moreKey("0")))
+ key("q", additionalMoreKey("1")),
+ key("w", additionalMoreKey("2")),
+ key("e", additionalMoreKey("3")),
+ key("r", additionalMoreKey("4")),
+ key("t", additionalMoreKey("5")),
+ key("y", additionalMoreKey("6")),
+ key("u", additionalMoreKey("7")),
+ key("i", additionalMoreKey("8")),
+ key("o", additionalMoreKey("9")),
+ key("p", additionalMoreKey("0")))
.setKeysOfRow(2, "a", "s", "d", "f", "g", "h", "j", "k", "l")
.setKeysOfRow(3, "z", "x", "c", "v", "b", "n", "m")
.build();
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Qwertz.java b/tests/src/com/android/inputmethod/keyboard/layout/Qwertz.java
index 6fce3f6d95476013aacc61b71dce1ff2539a8b1b..26ba6cffb5e305dbbc9cd304384e9186c798ec9e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Qwertz.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Qwertz.java
@@ -34,16 +34,16 @@ public final class Qwertz extends LayoutBase {
private static final ExpectedKey[][] ALPHABET_COMMON = new ExpectedKeyboardBuilder()
.setKeysOfRow(1,
- key("q", moreKey("1")),
- key("w", moreKey("2")),
- key("e", moreKey("3")),
- key("r", moreKey("4")),
- key("t", moreKey("5")),
- key("z", moreKey("6")),
- key("u", moreKey("7")),
- key("i", moreKey("8")),
- key("o", moreKey("9")),
- key("p", moreKey("0")))
+ key("q", additionalMoreKey("1")),
+ key("w", additionalMoreKey("2")),
+ key("e", additionalMoreKey("3")),
+ key("r", additionalMoreKey("4")),
+ key("t", additionalMoreKey("5")),
+ key("z", additionalMoreKey("6")),
+ key("u", additionalMoreKey("7")),
+ key("i", additionalMoreKey("8")),
+ key("o", additionalMoreKey("9")),
+ key("p", additionalMoreKey("0")))
.setKeysOfRow(2, "a", "s", "d", "f", "g", "h", "j", "k", "l")
.setKeysOfRow(3, "y", "x", "c", "v", "b", "n", "m")
.build();
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/SouthSlavic.java b/tests/src/com/android/inputmethod/keyboard/layout/SouthSlavic.java
index 4f8911baae6b1bf5a30660d973f2e3f066ebd8b4..be8b435d4ae2471e18e79126db9aeebdac7e7916 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/SouthSlavic.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/SouthSlavic.java
@@ -63,24 +63,24 @@ public final class SouthSlavic extends LayoutBase {
private static final ExpectedKey[][] ALPHABET_COMMON = new ExpectedKeyboardBuilder()
.setKeysOfRow(1,
// U+0459: "Ñ™" CYRILLIC SMALL LETTER LJE
- key("\u0459", moreKey("1")),
+ key("\u0459", additionalMoreKey("1")),
// U+045A: "Ñš" CYRILLIC SMALL LETTER NJE
- key("\u045A", moreKey("2")),
+ key("\u045A", additionalMoreKey("2")),
// U+0435: "е" CYRILLIC SMALL LETTER IE
- key("\u0435", moreKey("3")),
+ key("\u0435", additionalMoreKey("3")),
// U+0440: "Ñ€" CYRILLIC SMALL LETTER ER
- key("\u0440", moreKey("4")),
+ key("\u0440", additionalMoreKey("4")),
// U+0442: "Ñ‚" CYRILLIC SMALL LETTER TE
- key("\u0442", moreKey("5")),
- key(ROW1_6, moreKey("6")),
+ key("\u0442", additionalMoreKey("5")),
+ key(ROW1_6, additionalMoreKey("6")),
// U+0443: "у" CYRILLIC SMALL LETTER U
- key("\u0443", moreKey("7")),
+ key("\u0443", additionalMoreKey("7")),
// U+0438: "и" CYRILLIC SMALL LETTER I
- key("\u0438", moreKey("8")),
+ key("\u0438", additionalMoreKey("8")),
// U+043E: "о" CYRILLIC SMALL LETTER O
- key("\u043E", moreKey("9")),
+ key("\u043E", additionalMoreKey("9")),
// U+043F: "п" CYRILLIC SMALL LETTER PE
- key("\u043F", moreKey("0")),
+ key("\u043F", additionalMoreKey("0")),
// U+0448: "ш" CYRILLIC SMALL LETTER SHA
"\u0448")
.setKeysOfRow(2,
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Spanish.java b/tests/src/com/android/inputmethod/keyboard/layout/Spanish.java
index 9e65560894e9ec04544701384b5ab68641141029..225b9f6040c0e8e8cc43349f380e56b4675ecb68 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Spanish.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Spanish.java
@@ -36,16 +36,16 @@ public final class Spanish extends LayoutBase {
private static final ExpectedKey[][] ALPHABET_COMMON = new ExpectedKeyboardBuilder()
.setKeysOfRow(1,
- key("q", moreKey("1")),
- key("w", moreKey("2")),
- key("e", moreKey("3")),
- key("r", moreKey("4")),
- key("t", moreKey("5")),
- key("y", moreKey("6")),
- key("u", moreKey("7")),
- key("i", moreKey("8")),
- key("o", moreKey("9")),
- key("p", moreKey("0")))
+ key("q", additionalMoreKey("1")),
+ key("w", additionalMoreKey("2")),
+ key("e", additionalMoreKey("3")),
+ key("r", additionalMoreKey("4")),
+ key("t", additionalMoreKey("5")),
+ key("y", additionalMoreKey("6")),
+ key("u", additionalMoreKey("7")),
+ key("i", additionalMoreKey("8")),
+ key("o", additionalMoreKey("9")),
+ key("p", additionalMoreKey("0")))
.setKeysOfRow(2, "a", "s", "d", "f", "g", "h", "j", "k", "l", ROW2_10)
.setKeysOfRow(3, "z", "x", "c", "v", "b", "n", "m")
.build();
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Swiss.java b/tests/src/com/android/inputmethod/keyboard/layout/Swiss.java
index c6562e2458576c66680b23d6f9c5770ca9a0a994..01a602054225d6c921def8be5241d808909a7df1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Swiss.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Swiss.java
@@ -38,16 +38,16 @@ public final class Swiss extends LayoutBase {
private static final ExpectedKey[][] ALPHABET_COMMON = new ExpectedKeyboardBuilder()
.setKeysOfRow(1,
- key("q", moreKey("1")),
- key("w", moreKey("2")),
- key("e", moreKey("3")),
- key("r", moreKey("4")),
- key("t", moreKey("5")),
- key("z", moreKey("6")),
- key("u", moreKey("7")),
- key("i", moreKey("8")),
- key("o", moreKey("9")),
- key("p", moreKey("0")),
+ key("q", additionalMoreKey("1")),
+ key("w", additionalMoreKey("2")),
+ key("e", additionalMoreKey("3")),
+ key("r", additionalMoreKey("4")),
+ key("t", additionalMoreKey("5")),
+ key("z", additionalMoreKey("6")),
+ key("u", additionalMoreKey("7")),
+ key("i", additionalMoreKey("8")),
+ key("o", additionalMoreKey("9")),
+ key("p", additionalMoreKey("0")),
ROW1_11)
.setKeysOfRow(2, "a", "s", "d", "f", "g", "h", "j", "k", "l", ROW2_10, ROW2_11)
.setKeysOfRow(3, "y", "x", "c", "v", "b", "n", "m")
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java b/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
index f9427bc2dea4e569fd5b4955c2b2e6f2f7c2e6e7..cce9d5f39e76b6fdba016698b8f70bf497a3f537 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
@@ -17,6 +17,7 @@
package com.android.inputmethod.keyboard.layout.expected;
import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
+import com.android.inputmethod.keyboard.layout.expected.ExpectedKey.ExpectedAdditionalMoreKey;
import com.android.inputmethod.latin.Constants;
import com.android.inputmethod.latin.utils.StringUtils;
@@ -61,6 +62,15 @@ public abstract class AbstractLayoutBase {
return ExpectedKey.newInstance(key.getVisual(), key.getOutput(), moreKeys);
}
+ // Helper method to create an {@link ExpectedAdditionalMoreKey} object for an
+ // "additional more key" that has the label.
+ // The additional more keys can be defined independently from other more keys. The position of
+ // the additional more keys in the long press popup keyboard can be controlled by specifying
+ // special marker "%" in the usual more keys definitions.
+ public static ExpectedAdditionalMoreKey additionalMoreKey(final String label) {
+ return ExpectedAdditionalMoreKey.newInstance(label);
+ }
+
// Helper method to create an {@link ExpectedKey} object for a "more key" that has the label.
public static ExpectedKey moreKey(final String label) {
return ExpectedKey.newInstance(label);
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKey.java b/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKey.java
index 98c08aded3c211c7b56aac3d1100de6f3c46b4c1..ad08ba5a6d3b8c95c9beba6712f613bdb3cb5b63 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKey.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKey.java
@@ -18,7 +18,9 @@ package com.android.inputmethod.keyboard.layout.expected;
import com.android.inputmethod.keyboard.Key;
import com.android.inputmethod.keyboard.internal.MoreKeySpec;
+import com.android.inputmethod.latin.utils.CollectionUtils;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Locale;
@@ -29,44 +31,73 @@ public class ExpectedKey {
static ExpectedKey EMPTY_KEY = newInstance("");
// A key that has a string label and may have "more keys".
- static ExpectedKey newInstance(final String label, final ExpectedKey ... moreKeys) {
+ static ExpectedKey newInstance(final String label, final ExpectedKey... moreKeys) {
return newInstance(label, label, moreKeys);
}
// A key that has a string label and a different output text and may have "more keys".
static ExpectedKey newInstance(final String label, final String outputText,
- final ExpectedKey ... moreKeys) {
+ final ExpectedKey... moreKeys) {
return newInstance(ExpectedKeyVisual.newInstance(label),
ExpectedKeyOutput.newInstance(outputText), moreKeys);
}
// A key that has a string label and a code point output and may have "more keys".
static ExpectedKey newInstance(final String label, final int code,
- final ExpectedKey ... moreKeys) {
+ final ExpectedKey... moreKeys) {
return newInstance(ExpectedKeyVisual.newInstance(label),
ExpectedKeyOutput.newInstance(code), moreKeys);
}
// A key that has an icon and an output text and may have "more keys".
static ExpectedKey newInstance(final int iconId, final String outputText,
- final ExpectedKey ... moreKeys) {
+ final ExpectedKey... moreKeys) {
return newInstance(ExpectedKeyVisual.newInstance(iconId),
ExpectedKeyOutput.newInstance(outputText), moreKeys);
}
// A key that has an icon and a code point output and may have "more keys".
static ExpectedKey newInstance(final int iconId, final int code,
- final ExpectedKey ... moreKeys) {
+ final ExpectedKey... moreKeys) {
return newInstance(ExpectedKeyVisual.newInstance(iconId),
ExpectedKeyOutput.newInstance(code), moreKeys);
}
static ExpectedKey newInstance(final ExpectedKeyVisual visual, final ExpectedKeyOutput output,
- final ExpectedKey ... moreKeys) {
+ final ExpectedKey... moreKeys) {
if (moreKeys.length == 0) {
return new ExpectedKey(visual, output);
}
- return new ExpectedKeyWithMoreKeys(visual, output, moreKeys);
+ // The more keys are the extra keys that the main keyboard key may have in its long press
+ // popup keyboard.
+ // The additional more keys can be defined independently from other more keys.
+ // The position of the additional more keys in the long press popup keyboard can be
+ // controlled by specifying special marker "%" in the usual more keys definitions.
+ final ArrayList<ExpectedKey> moreKeysList = CollectionUtils.newArrayList();
+ final ArrayList<ExpectedAdditionalMoreKey> additionalMoreKeys =
+ CollectionUtils.newArrayList();
+ int firstAdditionalMoreKeyIndex = -1;
+ for (int index = 0; index < moreKeys.length; index++) {
+ final ExpectedKey moreKey = moreKeys[index];
+ if (moreKey instanceof ExpectedAdditionalMoreKey) {
+ additionalMoreKeys.add((ExpectedAdditionalMoreKey) moreKey);
+ if (firstAdditionalMoreKeyIndex < 0) {
+ firstAdditionalMoreKeyIndex = index;
+ }
+ } else {
+ moreKeysList.add(moreKey);
+ }
+ }
+ if (additionalMoreKeys.isEmpty()) {
+ return new ExpectedKeyWithMoreKeys(visual, output, moreKeys);
+ }
+ final ExpectedKey[] moreKeysArray = moreKeysList.toArray(
+ new ExpectedKey[moreKeysList.size()]);
+ final ExpectedAdditionalMoreKey[] additionalMoreKeysArray = additionalMoreKeys.toArray(
+ new ExpectedAdditionalMoreKey[additionalMoreKeys.size()]);
+ return new ExpectedKeyWithMoreKeysAndAdditionalMoreKeys(
+ visual, output, moreKeysArray, firstAdditionalMoreKeyIndex,
+ additionalMoreKeysArray);
}
private static final ExpectedKey[] EMPTY_KEYS = new ExpectedKey[0];
@@ -89,6 +120,27 @@ public class ExpectedKey {
return EMPTY_KEYS;
}
+ public ExpectedKey setMoreKeys(final ExpectedKey... moreKeys) {
+ return newInstance(mVisual, mOutput, moreKeys);
+ }
+
+ public ExpectedKey setAdditionalMoreKeys(
+ final ExpectedAdditionalMoreKey... additionalMoreKeys) {
+ if (additionalMoreKeys.length == 0) {
+ return this;
+ }
+ return new ExpectedKeyWithMoreKeysAndAdditionalMoreKeys(
+ mVisual, mOutput, EMPTY_KEYS, 0 /* additionalMoreKeysIndex */, additionalMoreKeys);
+ }
+
+ public ExpectedKey setAdditionalMoreKeysIndex(final int additionalMoreKeysIndex) {
+ if (additionalMoreKeysIndex == 0) {
+ return this;
+ }
+ return new ExpectedKeyWithMoreKeysAndAdditionalMoreKeys(
+ mVisual, mOutput, EMPTY_KEYS, additionalMoreKeysIndex);
+ }
+
protected ExpectedKey(final ExpectedKeyVisual visual, final ExpectedKeyOutput output) {
mVisual = visual;
mOutput = output;
@@ -110,14 +162,14 @@ public class ExpectedKey {
@Override
public boolean equals(final Object object) {
if (object instanceof ExpectedKey) {
- final ExpectedKey key = (ExpectedKey)object;
+ final ExpectedKey key = (ExpectedKey) object;
return mVisual.equalsTo(key.mVisual) && mOutput.equalsTo(key.mOutput)
&& Arrays.equals(getMoreKeys(), key.getMoreKeys());
}
return false;
}
- private static int hashCode(final Object ... objects) {
+ private static int hashCode(final Object... objects) {
return Arrays.hashCode(objects);
}
@@ -134,14 +186,43 @@ public class ExpectedKey {
return mVisual + "|" + mOutput;
}
+ /**
+ * This class represents an expected "additional more key".
+ *
+ * The additional more keys can be defined independently from other more keys. The position of
+ * the additional more keys in the long press popup keyboard can be controlled by specifying
+ * special marker "%" in the usual more keys definitions.
+ */
+ public static class ExpectedAdditionalMoreKey extends ExpectedKey {
+ public static ExpectedAdditionalMoreKey newInstance(final String label) {
+ return new ExpectedAdditionalMoreKey(ExpectedKeyVisual.newInstance(label),
+ ExpectedKeyOutput.newInstance(label));
+ }
+
+ public static ExpectedAdditionalMoreKey newInstance(final ExpectedKey key) {
+ return new ExpectedAdditionalMoreKey(key.getVisual(), key.getOutput());
+ }
+
+ ExpectedAdditionalMoreKey(final ExpectedKeyVisual visual, final ExpectedKeyOutput output) {
+ super(visual, output);
+ }
+
+ @Override
+ public ExpectedAdditionalMoreKey toUpperCase(final Locale locale) {
+ final ExpectedKey upperCaseKey = super.toUpperCase(locale);
+ return new ExpectedAdditionalMoreKey(
+ upperCaseKey.getVisual(), upperCaseKey.getOutput());
+ }
+ }
+
/**
* This class represents an expected key that has "more keys".
*/
- private static final class ExpectedKeyWithMoreKeys extends ExpectedKey {
+ private static class ExpectedKeyWithMoreKeys extends ExpectedKey {
private final ExpectedKey[] mMoreKeys;
- ExpectedKeyWithMoreKeys(final ExpectedKeyVisual visual,
- final ExpectedKeyOutput output, final ExpectedKey ... moreKeys) {
+ ExpectedKeyWithMoreKeys(final ExpectedKeyVisual visual, final ExpectedKeyOutput output,
+ final ExpectedKey... moreKeys) {
super(visual, output);
mMoreKeys = moreKeys;
}
@@ -161,16 +242,37 @@ public class ExpectedKey {
return mMoreKeys;
}
+ @Override
+ public ExpectedKey setAdditionalMoreKeys(
+ final ExpectedAdditionalMoreKey... additionalMoreKeys) {
+ if (additionalMoreKeys.length == 0) {
+ return this;
+ }
+ return new ExpectedKeyWithMoreKeysAndAdditionalMoreKeys(
+ getVisual(), getOutput(), mMoreKeys, 0 /* additionalMoreKeysIndex */,
+ additionalMoreKeys);
+ }
+
+ @Override
+ public ExpectedKey setAdditionalMoreKeysIndex(final int additionalMoreKeysIndex) {
+ if (additionalMoreKeysIndex == 0) {
+ return this;
+ }
+ return new ExpectedKeyWithMoreKeysAndAdditionalMoreKeys(
+ getVisual(), getOutput(), mMoreKeys, additionalMoreKeysIndex);
+ }
+
@Override
public boolean equalsTo(final Key key) {
if (getVisual().equalsTo(key) && getOutput().equalsTo(key)) {
- final MoreKeySpec[] moreKeys = key.getMoreKeys();
+ final MoreKeySpec[] moreKeySpecs = key.getMoreKeys();
+ final ExpectedKey[] moreKeys = getMoreKeys();
// This key should have at least one "more key".
- if (moreKeys == null || moreKeys.length != mMoreKeys.length) {
+ if (moreKeySpecs == null || moreKeySpecs.length != moreKeys.length) {
return false;
}
- for (int index = 0; index < moreKeys.length; index++) {
- if (!mMoreKeys[index].equalsTo(moreKeys[index])) {
+ for (int index = 0; index < moreKeySpecs.length; index++) {
+ if (!moreKeys[index].equalsTo(moreKeySpecs[index])) {
return false;
}
}
@@ -187,7 +289,77 @@ public class ExpectedKey {
@Override
public String toString() {
- return super.toString() + "^" + Arrays.toString(mMoreKeys);
+ return super.toString() + "^" + Arrays.toString(getMoreKeys());
+ }
+ }
+
+ /**
+ * This class represents an expected key that has "more keys" and "additional more keys".
+ */
+ private static final class ExpectedKeyWithMoreKeysAndAdditionalMoreKeys
+ extends ExpectedKeyWithMoreKeys {
+ private final ExpectedAdditionalMoreKey[] mAdditionalMoreKeys;
+ private final int mAdditionalMoreKeysIndex;
+
+ ExpectedKeyWithMoreKeysAndAdditionalMoreKeys(final ExpectedKeyVisual visual,
+ final ExpectedKeyOutput output, final ExpectedKey[] moreKeys,
+ final int additionalMoreKeysIndex,
+ final ExpectedAdditionalMoreKey... additionalMoreKeys) {
+ super(visual, output, moreKeys);
+ mAdditionalMoreKeysIndex = additionalMoreKeysIndex;
+ mAdditionalMoreKeys = additionalMoreKeys;
+ }
+
+ @Override
+ public ExpectedKey setMoreKeys(final ExpectedKey... moreKeys) {
+ return new ExpectedKeyWithMoreKeysAndAdditionalMoreKeys(
+ getVisual(), getOutput(), moreKeys, mAdditionalMoreKeysIndex,
+ mAdditionalMoreKeys);
+ }
+
+ @Override
+ public ExpectedKey setAdditionalMoreKeys(
+ final ExpectedAdditionalMoreKey... additionalMoreKeys) {
+ return new ExpectedKeyWithMoreKeysAndAdditionalMoreKeys(
+ getVisual(), getOutput(), super.getMoreKeys(), mAdditionalMoreKeysIndex,
+ additionalMoreKeys);
+ }
+
+ @Override
+ public ExpectedKey setAdditionalMoreKeysIndex(final int additionalMoreKeysIndex) {
+ return new ExpectedKeyWithMoreKeysAndAdditionalMoreKeys(
+ getVisual(), getOutput(), super.getMoreKeys(), additionalMoreKeysIndex,
+ mAdditionalMoreKeys);
+ }
+
+ @Override
+ public ExpectedKey toUpperCase(final Locale locale) {
+ final ExpectedKey[] moreKeys = super.getMoreKeys();
+ final ExpectedKey[] upperCaseMoreKeys = new ExpectedKey[moreKeys.length];
+ for (int i = 0; i < moreKeys.length; i++) {
+ upperCaseMoreKeys[i] = moreKeys[i].toUpperCase(locale);
+ }
+ final ExpectedAdditionalMoreKey[] upperCaseAdditionalMoreKeys =
+ new ExpectedAdditionalMoreKey[mAdditionalMoreKeys.length];
+ for (int i = 0; i < mAdditionalMoreKeys.length; i++) {
+ upperCaseAdditionalMoreKeys[i] = mAdditionalMoreKeys[i].toUpperCase(locale);
+ }
+ return new ExpectedKeyWithMoreKeysAndAdditionalMoreKeys(
+ getVisual().toUpperCase(locale), getOutput().toUpperCase(locale),
+ upperCaseMoreKeys, mAdditionalMoreKeysIndex, upperCaseAdditionalMoreKeys);
+ }
+
+ @Override
+ public ExpectedKey[] getMoreKeys() {
+ final ExpectedKey[] moreKeys = super.getMoreKeys();
+ final ExpectedKey[] edittedMoreKeys = Arrays.copyOf(
+ moreKeys, moreKeys.length + mAdditionalMoreKeys.length);
+ System.arraycopy(edittedMoreKeys, mAdditionalMoreKeysIndex,
+ edittedMoreKeys, mAdditionalMoreKeysIndex + mAdditionalMoreKeys.length,
+ moreKeys.length - mAdditionalMoreKeysIndex);
+ System.arraycopy(mAdditionalMoreKeys, 0, edittedMoreKeys, mAdditionalMoreKeysIndex,
+ mAdditionalMoreKeys.length);
+ return edittedMoreKeys;
}
}
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyboardBuilder.java b/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyboardBuilder.java
index c73fbf7b2ff624040a725724b4b12f6394182ac3..f068ad11d2e1426c6dfa47cf8584bbbbc3465b6b 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyboardBuilder.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyboardBuilder.java
@@ -163,11 +163,38 @@ public final class ExpectedKeyboardBuilder extends AbstractKeyboardBuilder<Expec
}
private void setMoreKeysOf(final ExpectedKeyVisual visual, final ExpectedKey[] moreKeys) {
+ replaceKeyOf(visual, new ReplaceJob() {
+ @Override
+ public ExpectedKey[] replacingKeys(final ExpectedKey oldKey) {
+ return new ExpectedKey[] { oldKey.setMoreKeys(moreKeys) };
+ }
+ @Override
+ public boolean stopAtFirstOccurrence() {
+ return true;
+ }
+ });
+ }
+
+ /**
+ * Set the "additional more keys position" of the key that has the specified label.
+ * @param label the label of the key to set the "additional more keys".
+ * @param additionalMoreKeysPosition the position in the "more keys" where
+ * "additional more keys" will be merged. The position starts from 1.
+ * @return this builder.
+ */
+ public ExpectedKeyboardBuilder setAdditionalMoreKeysPositionOf(final String label,
+ final int additionalMoreKeysPosition) {
+ final int additionalMoreKeysIndex = additionalMoreKeysPosition - 1;
+ if (additionalMoreKeysIndex < 0) {
+ throw new RuntimeException("Illegal additional more keys position: "
+ + additionalMoreKeysPosition);
+ }
+ final ExpectedKeyVisual visual = ExpectedKeyVisual.newInstance(label);
replaceKeyOf(visual, new ReplaceJob() {
@Override
public ExpectedKey[] replacingKeys(final ExpectedKey oldKey) {
return new ExpectedKey[] {
- ExpectedKey.newInstance(oldKey.getVisual(), oldKey.getOutput(), moreKeys)
+ oldKey.setAdditionalMoreKeysIndex(additionalMoreKeysIndex)
};
}
@Override
@@ -175,6 +202,7 @@ public final class ExpectedKeyboardBuilder extends AbstractKeyboardBuilder<Expec
return true;
}
});
+ return this;
}
/**
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/EnglishCustomizer.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/EnglishCustomizer.java
new file mode 100644
index 0000000000000000000000000000000000000000..29264ff3b0f533b4e952885cbdc5a9d597ed5937
--- /dev/null
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/EnglishCustomizer.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+package com.android.inputmethod.keyboard.layout.tests;
+
+import com.android.inputmethod.keyboard.layout.LayoutBase.LayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+
+import java.util.Locale;
+
+class EnglishCustomizer extends LayoutCustomizer {
+ EnglishCustomizer(final Locale locale) { super(locale); }
+
+ @Override
+ public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
+ return builder
+ // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+ // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+ // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ // U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
+ .setMoreKeysOf("e", "\u00E8", "\u00E9", "\u00EA", "\u00EB", "\u0113")
+ // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+ // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
+ .setMoreKeysOf("u", "\u00FB", "\u00FC", "\u00F9", "\u00FA", "\u016B")
+ // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ // U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
+ // U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
+ // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+ .setMoreKeysOf("i", "\u00EE", "\u00EF", "\u00ED", "\u012B", "\u00EC")
+ // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ // U+0153: "Å“" LATIN SMALL LIGATURE OE
+ // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+ // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
+ // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+ .setMoreKeysOf("o",
+ "\u00F4", "\u00F6", "\u00F2", "\u00F3", "\u0153", "\u00F8", "\u014D",
+ "\u00F5")
+ // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+ // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ // U+00E6: "æ" LATIN SMALL LETTER AE
+ // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+ // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+ // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
+ .setMoreKeysOf("a",
+ "\u00E0", "\u00E1", "\u00E2", "\u00E4", "\u00E6", "\u00E3", "\u00E5",
+ "\u0101")
+ // U+00DF: "ß" LATIN SMALL LETTER SHARP S
+ .setMoreKeysOf("s", "\u00DF")
+ // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ .setMoreKeysOf("c", "\u00E7")
+ // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ .setMoreKeysOf("n", "\u00F1");
+ }
+}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/FrenchCustomizer.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/FrenchCustomizer.java
new file mode 100644
index 0000000000000000000000000000000000000000..b10b368e763aa9092993405adf26e6949dbc6a08
--- /dev/null
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/FrenchCustomizer.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+package com.android.inputmethod.keyboard.layout.tests;
+
+import com.android.inputmethod.keyboard.layout.LayoutBase.LayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+
+import java.util.Locale;
+
+class FrenchCustomizer extends LayoutCustomizer {
+ FrenchCustomizer(final Locale locale) { super(locale); }
+
+ @Override
+ public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
+ return builder
+ // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
+ // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ // U+00E6: "æ" LATIN SMALL LETTER AE
+ // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+ // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+ // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+ // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
+ // U+00AA: "ª" FEMININE ORDINAL INDICATOR
+ .setAdditionalMoreKeysPositionOf("a", 3)
+ .setMoreKeysOf("a",
+ "\u00E0", "\u00E2", "\u00E6", "\u00E1", "\u00E4", "\u00E3", "\u00E5",
+ "\u0101", "\u00AA")
+ // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+ // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+ // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ // U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+ // U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+ // U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
+ .setAdditionalMoreKeysPositionOf("e", 5)
+ .setMoreKeysOf("e",
+ "\u00E9", "\u00E8", "\u00EA", "\u00EB", "\u0119", "\u0117", "\u0113")
+ // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
+ .setMoreKeysOf("y", "\u00FF")
+ // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+ // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
+ .setAdditionalMoreKeysPositionOf("u", 3)
+ .setMoreKeysOf("u", "\u00F9", "\u00FB", "\u00FC", "\u00FA", "\u016B")
+ // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+ // U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
+ // U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+ // U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
+ .setAdditionalMoreKeysPositionOf("i", 2)
+ .setMoreKeysOf("i", "\u00EE", "\u00EF", "\u00EC", "\u00ED", "\u012F", "\u012B")
+ // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ // U+0153: "Å“" LATIN SMALL LIGATURE OE
+ // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+ // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+ // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
+ // U+00BA: "º" MASCULINE ORDINAL INDICATOR
+ .setAdditionalMoreKeysPositionOf("o", 3)
+ .setMoreKeysOf("o",
+ "\u00F4", "\u0153", "\u00F6", "\u00F2", "\u00F3", "\u00F5", "\u00F8",
+ "\u014D", "\u00BA")
+ // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+ // U+010D: "Ä" LATIN SMALL LETTER C WITH CARON
+ .setMoreKeysOf("c", "\u00E7", "\u0107", "\u010D");
+ }
+}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/GermanCustomizer.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/GermanCustomizer.java
new file mode 100644
index 0000000000000000000000000000000000000000..cd881406e7495001886ccd32780798661990ecc0
--- /dev/null
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/GermanCustomizer.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+package com.android.inputmethod.keyboard.layout.tests;
+
+import com.android.inputmethod.keyboard.layout.Symbols;
+import com.android.inputmethod.keyboard.layout.LayoutBase.LayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+
+import java.util.Locale;
+
+class GermanCustomizer extends LayoutCustomizer {
+ public GermanCustomizer(final Locale locale) { super(locale); }
+
+ @Override
+ public ExpectedKey[] getDoubleQuoteMoreKeys() { return Symbols.DOUBLE_QUOTES_R9L; }
+
+ @Override
+ public ExpectedKey[] getSingleQuoteMoreKeys() { return Symbols.SINGLE_QUOTES_R9L; }
+
+ @Override
+ public ExpectedKey[] getDoubleAngleQuoteKeys() { return Symbols.DOUBLE_ANGLE_QUOTES_RL; }
+
+ @Override
+ public ExpectedKey[] getSingleAngleQuoteKeys() { return Symbols.SINGLE_ANGLE_QUOTES_RL; }
+
+ @Override
+ public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
+ return builder
+ // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+ // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+ // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ // U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+ .setMoreKeysOf("e", "\u00E9", "\u00E8", "\u00EA", "\u00EB", "\u0117")
+ // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+ // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
+ .setMoreKeysOf("u", "\u00FC", "\u00FB", "\u00F9", "\u00FA", "\u016B")
+ // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+ // U+0153: "Å“" LATIN SMALL LIGATURE OE
+ // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+ // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
+ .setMoreKeysOf("o",
+ "\u00F6", "\u00F4", "\u00F2", "\u00F3", "\u00F5", "\u0153", "\u00F8",
+ "\u014D")
+ // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
+ // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+ // U+00E6: "æ" LATIN SMALL LETTER AE
+ // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+ // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+ // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
+ .setMoreKeysOf("a",
+ "\u00E4", "\u00E2", "\u00E0", "\u00E1", "\u00E6", "\u00E3", "\u00E5",
+ "\u0101")
+ // U+00DF: "ß" LATIN SMALL LETTER SHARP S
+ // U+015B: "Å›" LATIN SMALL LETTER S WITH ACUTE
+ // U+0161: "Å¡" LATIN SMALL LETTER S WITH CARON
+ .setMoreKeysOf("s", "\u00DF", "\u015B", "\u0161")
+ // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ // U+0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
+ .setMoreKeysOf("n", "\u00F1", "\u0144");
+ }
+}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
index b52d20c45ea1ece41e789ae9fdd27c14f1a36908..555ec897107b23182e364099c4f8914be922e144 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
@@ -28,6 +28,7 @@ import com.android.inputmethod.keyboard.layout.LayoutBase;
import com.android.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
import com.android.inputmethod.keyboard.layout.expected.ActualKeyboardBuilder;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import com.android.inputmethod.keyboard.layout.expected.ExpectedKey.ExpectedAdditionalMoreKey;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
@@ -72,6 +73,12 @@ abstract class LayoutTestsBase extends KeyboardLayoutSetTestsBase {
return AbstractLayoutBase.key(key, moreKeys);
}
+ // Helper method to create an {@link ExpectedAdditionalMoreKey} object for an
+ // "additional more key" that has the label.
+ public static ExpectedAdditionalMoreKey additionalMoreKey(final String label) {
+ return AbstractLayoutBase.additionalMoreKey(label);
+ }
+
// Helper method to create an {@link ExpectedKey} object for a "more key" that has the label.
static ExpectedKey moreKey(final String label) {
return AbstractLayoutBase.moreKey(label);
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/PortugueseCustomizer.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/PortugueseCustomizer.java
new file mode 100644
index 0000000000000000000000000000000000000000..629e8cb8b338a2448ff2ce231198f9c0da6d19ec
--- /dev/null
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/PortugueseCustomizer.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+package com.android.inputmethod.keyboard.layout.tests;
+
+import com.android.inputmethod.keyboard.layout.LayoutBase.LayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+
+import java.util.Locale;
+
+class PortugueseCustomizer extends LayoutCustomizer {
+ PortugueseCustomizer(final Locale locale) { super(locale); }
+
+ @Override
+ public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
+ return builder
+ // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+ // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+ // U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+ // U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+ // U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
+ // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ .setMoreKeysOf("e",
+ "\u00E9", "\u00EA", "\u00E8", "\u0119", "\u0117", "\u0113", "\u00EB")
+ // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+ // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
+ .setMoreKeysOf("u", "\u00FA", "\u00FC", "\u00F9", "\u00FB", "\u016B")
+ // U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
+ // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+ // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ // U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+ // U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
+ .setMoreKeysOf("i", "\u00ED", "\u00EE", "\u00EC", "\u00EF", "\u012F", "\u012B")
+ // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+ // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ // U+0153: "Å“" LATIN SMALL LIGATURE OE
+ // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+ // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
+ // U+00BA: "º" MASCULINE ORDINAL INDICATOR
+ .setMoreKeysOf("o",
+ "\u00F3", "\u00F5", "\u00F4", "\u00F2", "\u00F6", "\u0153", "\u00F8",
+ "\u014D", "\u00BA")
+ // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+ // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+ // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
+ // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+ // U+00E6: "æ" LATIN SMALL LETTER AE
+ // U+00AA: "ª" FEMININE ORDINAL INDICATOR
+ .setMoreKeysOf("a",
+ "\u00E1", "\u00E3", "\u00E0", "\u00E2", "\u00E4", "\u00E5", "\u00E6",
+ "\u00AA")
+ // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ // U+010D: "Ä" LATIN SMALL LETTER C WITH CARON
+ // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+ .setMoreKeysOf("c", "\u00E7", "\u010D", "\u0107");
+ }
+}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/SpanishCustomizer.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/SpanishCustomizer.java
new file mode 100644
index 0000000000000000000000000000000000000000..da4a83c732b5a9584efdcb3106410476843a2a89
--- /dev/null
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/SpanishCustomizer.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+package com.android.inputmethod.keyboard.layout.tests;
+
+import com.android.inputmethod.keyboard.layout.LayoutBase;
+import com.android.inputmethod.keyboard.layout.LayoutBase.LayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.Spanish;
+import com.android.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
+import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+
+import java.util.Locale;
+
+class SpanishCustomizer extends LayoutCustomizer {
+ SpanishCustomizer(final Locale locale) { super(locale); }
+
+ @Override
+ public ExpectedKey[] getPunctuationMoreKeys(final boolean isPhone) {
+ return isPhone ? PHONE_PUNCTUATION_MORE_KEYS
+ : LayoutBase.TABLET_PUNCTUATION_MORE_KEYS;
+ }
+
+ // Punctuation more keys for phone form factor.
+ private static final ExpectedKey[] PHONE_PUNCTUATION_MORE_KEYS = AbstractLayoutBase.joinKeys(
+ // U+00A1: "¡" INVERTED EXCLAMATION MARK
+ // U+00BF: "¿" INVERTED QUESTION MARK
+ "\u00A1", ";", "/", "(", ")", "#", "!", ",", "?",
+ "\u00BF", "&", "%", "+", "\"", "-", ":", "'", "@");
+
+ @Override
+ public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
+ return builder
+ // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
+ // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
+ // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
+ // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
+ // U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
+ // U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
+ // U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
+ .setMoreKeysOf("e",
+ "\u00E9", "\u00E8", "\u00EB", "\u00EA", "\u0119", "\u0117", "\u0113")
+ // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
+ // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
+ // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
+ // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
+ // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
+ .setMoreKeysOf("u", "\u00FA", "\u00FC", "\u00F9", "\u00FB", "\u016B")
+ // U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
+ // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
+ // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
+ // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
+ // U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
+ // U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
+ .setMoreKeysOf("i", "\u00ED", "\u00EF", "\u00EC", "\u00EE", "\u012F", "\u012B")
+ // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
+ // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
+ // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
+ // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
+ // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
+ // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
+ // U+0153: "Å“" LATIN SMALL LIGATURE OE
+ // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
+ // U+00BA: "º" MASCULINE ORDINAL INDICATOR
+ .setMoreKeysOf("o",
+ "\u00F3", "\u00F2", "\u00F6", "\u00F4", "\u00F5", "\u00F8", "\u0153",
+ "\u014D", "\u00BA")
+ // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+ // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
+ // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+ // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+ // U+0105: "Ä…" LATIN SMALL LETTER A WITH OGONEK
+ // U+00E6: "æ" LATIN SMALL LETTER AE
+ // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
+ // U+00AA: "ª" FEMININE ORDINAL INDICATOR
+ .setMoreKeysOf("a",
+ "\u00E1", "\u00E0", "\u00E4", "\u00E2", "\u00E3", "\u00E5", "\u0105",
+ "\u00E6", "\u0101", "\u00AA")
+ // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ .replaceKeyOfLabel(Spanish.ROW2_10, "\u00F1")
+ // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
+ // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
+ // U+010D: "Ä" LATIN SMALL LETTER C WITH CARON
+ .setMoreKeysOf("c", "\u00E7", "\u0107", "\u010D")
+ // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
+ // U+0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
+ .setMoreKeysOf("n", "\u00F1", "\u0144");
+ }
+}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAfrikaans.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAfrikaans.java
index c98b4a5a9c3ad46b64850adca7902e9a23eedbdf..cd2259888746aee52a9b17ff2c4af7427f5384dc 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAfrikaans.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAfrikaans.java
@@ -50,17 +50,16 @@ public final class TestsAfrikaans extends LayoutTestsBase {
// U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
// U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
.setMoreKeysOf("e",
- "3", "\u00E9", "\u00E8", "\u00EA", "\u00EB", "\u0119", "\u0117",
- "\u0113")
+ "\u00E9", "\u00E8", "\u00EA", "\u00EB", "\u0119", "\u0117", "\u0113")
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FA", "\u00FB", "\u00FC", "\u00F9", "\u016B")
+ .setMoreKeysOf("u", "\u00FA", "\u00FB", "\u00FC", "\u00F9", "\u016B")
// U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
// U+0133: "ij" LATIN SMALL LIGATURE IJ
- .setMoreKeysOf("y", "6", "\u00FD", "\u0133")
+ .setMoreKeysOf("y", "\u00FD", "\u0133")
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
@@ -69,8 +68,7 @@ public final class TestsAfrikaans extends LayoutTestsBase {
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
// U+0133: "ij" LATIN SMALL LIGATURE IJ
.setMoreKeysOf("i",
- "8", "\u00ED", "\u00EC", "\u00EF", "\u00EE", "\u012F", "\u012B",
- "\u0133")
+ "\u00ED", "\u00EC", "\u00EF", "\u00EE", "\u012F", "\u012B", "\u0133")
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
@@ -80,8 +78,8 @@ public final class TestsAfrikaans extends LayoutTestsBase {
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
.setMoreKeysOf("o",
- "9", "\u00F3", "\u00F4", "\u00F6", "\u00F2", "\u00F5", "\u0153",
- "\u00F8", "\u014D")
+ "\u00F3", "\u00F4", "\u00F6", "\u00F2", "\u00F5", "\u0153", "\u00F8",
+ "\u014D")
// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
// U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAzerbaijaniAZ.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAzerbaijaniAZ.java
index 84d5a36270070a340d6bf05dfd03dd78e72f3072..f5317e269ff665521c41dbb3ce75cac6c5dac8e0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAzerbaijaniAZ.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAzerbaijaniAZ.java
@@ -43,13 +43,13 @@ public final class TestsAzerbaijaniAZ extends LayoutTestsBase {
public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
return builder
// U+0259: "É™" LATIN SMALL LETTER SCHWA
- .setMoreKeysOf("e", "3", "\u0259")
+ .setMoreKeysOf("e", "\u0259")
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FC", "\u00FB", "\u00F9", "\u00FA", "\u016B")
+ .setMoreKeysOf("u", "\u00FC", "\u00FB", "\u00F9", "\u00FA", "\u016B")
// U+0131: "ı" LATIN SMALL LETTER DOTLESS I
// U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
@@ -58,8 +58,7 @@ public final class TestsAzerbaijaniAZ extends LayoutTestsBase {
// U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
.setMoreKeysOf("i",
- "8", "\u0131", "\u00EE", "\u00EF", "\u00EC", "\u00ED", "\u012F",
- "\u012B")
+ "\u0131", "\u00EE", "\u00EF", "\u00EC", "\u00ED", "\u012F", "\u012B")
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
// U+0153: "Å“" LATIN SMALL LIGATURE OE
@@ -69,8 +68,8 @@ public final class TestsAzerbaijaniAZ extends LayoutTestsBase {
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
.setMoreKeysOf("o",
- "9", "\u00F6", "\u00F4", "\u0153", "\u00F2", "\u00F3", "\u00F5",
- "\u00F8", "\u014D")
+ "\u00F6", "\u00F4", "\u0153", "\u00F2", "\u00F3", "\u00F5", "\u00F8",
+ "\u014D")
// U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
.setMoreKeysOf("a", "\u00E2")
// U+015F: "ÅŸ" LATIN SMALL LETTER S WITH CEDILLA
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBelarusianBY.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBelarusianBY.java
index 476841c232231a247d376da64947c25b91f605af..c5238d54f8c31ab6e7d29c61a4159bf38913dfae 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBelarusianBY.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBelarusianBY.java
@@ -56,15 +56,15 @@ public final class TestsBelarusianBY extends LayoutTestsBase {
return builder
// U+0435: "е" CYRILLIC SMALL LETTER IE
// U+0451: "Ñ‘" CYRILLIC SMALL LETTER IO
- .setMoreKeysOf("\u0435", "5", "\u0451")
+ .setMoreKeysOf("\u0435", "\u0451")
// U+045E: "Ñž" CYRILLIC SMALL LETTER SHORT U
- .replaceKeyOfLabel(EastSlavic.ROW1_9, key("\u045E", moreKey("9")))
+ .replaceKeyOfLabel(EastSlavic.ROW1_9, key("\u045E", additionalMoreKey("9")))
// U+044B: "Ñ‹" CYRILLIC SMALL LETTER YERU
- .replaceKeyOfLabel(EastSlavic.ROW2_2, key("\u044B"))
+ .replaceKeyOfLabel(EastSlavic.ROW2_2, "\u044B")
// U+044D: "Ñ" CYRILLIC SMALL LETTER E
- .replaceKeyOfLabel(EastSlavic.ROW2_11, key("\u044D"))
+ .replaceKeyOfLabel(EastSlavic.ROW2_11, "\u044D")
// U+0456: "Ñ–" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
- .replaceKeyOfLabel(EastSlavic.ROW3_5, key("\u0456"))
+ .replaceKeyOfLabel(EastSlavic.ROW3_5, "\u0456")
// U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN
// U+044A: "ÑŠ" CYRILLIC SMALL LETTER HARD SIGN
.setMoreKeysOf("\u044C", "\u044A");
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCatalan.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCatalan.java
index ec03f0d92c668b0b219eb1d7f93960c56a10499e..988eb81a34a982edee94a178675ce4d2562ba89f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCatalan.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCatalan.java
@@ -19,7 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.LayoutBase.EuroCustomizer;
import com.android.inputmethod.keyboard.layout.Spanish;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
@@ -37,7 +37,7 @@ public class TestsCatalan extends LayoutTestsBase {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class CatalanCustomizer extends EuroLayoutCustomizer {
+ private static class CatalanCustomizer extends EuroCustomizer {
public CatalanCustomizer(final Locale locale) { super(locale); }
@Override
@@ -66,22 +66,20 @@ public class TestsCatalan extends LayoutTestsBase {
// U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
// U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
.setMoreKeysOf("e",
- "3", "\u00E8", "\u00E9", "\u00EB", "\u00EA", "\u0119", "\u0117",
- "\u0113")
+ "\u00E8", "\u00E9", "\u00EB", "\u00EA", "\u0119", "\u0117", "\u0113")
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FA", "\u00FC", "\u00F9", "\u00FB", "\u016B")
+ .setMoreKeysOf("u", "\u00FA", "\u00FC", "\u00F9", "\u00FB", "\u016B")
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
// U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
// U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- .setMoreKeysOf("i",
- "8", "\u00ED", "\u00EF", "\u00EC", "\u00EE", "\u012F", "\u012B")
+ .setMoreKeysOf("i", "\u00ED", "\u00EF", "\u00EC", "\u00EE", "\u012F", "\u012B")
// U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
@@ -92,8 +90,8 @@ public class TestsCatalan extends LayoutTestsBase {
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
// U+00BA: "º" MASCULINE ORDINAL INDICATOR
.setMoreKeysOf("o",
- "9", "\u00F2", "\u00F3", "\u00F6", "\u00F4", "\u00F5", "\u00F8",
- "\u0153", "\u014D", "\u00BA")
+ "\u00F2", "\u00F3", "\u00F6", "\u00F4", "\u00F5", "\u00F8", "\u0153",
+ "\u014D", "\u00BA")
// U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
@@ -111,7 +109,7 @@ public class TestsCatalan extends LayoutTestsBase {
// U+0142: "Å‚" LATIN SMALL LETTER L WITH STROKE
.setMoreKeysOf("l", "l\u00B7l", "\u0142")
// U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
- .replaceKeyOfLabel(Spanish.ROW2_10, key("\u00E7"))
+ .replaceKeyOfLabel(Spanish.ROW2_10, "\u00E7")
// U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
// U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
// U+010D: "Ä" LATIN SMALL LETTER C WITH CARON
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCroatian.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCroatian.java
index cf76de52e350509952c41d1c672c1d88daf77f5e..8575ef219ddf8224369c60176d04a615b17972d6 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCroatian.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCroatian.java
@@ -59,7 +59,7 @@ public final class TestsCroatian extends LayoutTestsBase {
// U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
// U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
// U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
- .setMoreKeysOf("z", "6", "\u017E", "\u017A", "\u017C")
+ .setMoreKeysOf("z", "\u017E", "\u017A", "\u017C")
// U+0161: "Å¡" LATIN SMALL LETTER S WITH CARON
// U+015B: "Å›" LATIN SMALL LETTER S WITH ACUTE
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCzech.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCzech.java
index 5cf47401d8bb2d2c1e41f50612c56be2713bd4cf..f4794707fddc917e766d0a8e1a4eeaf382955845 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCzech.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCzech.java
@@ -65,32 +65,30 @@ public final class TestsCzech extends LayoutTestsBase {
// U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
// U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
.setMoreKeysOf("e",
- "3", "\u00E9", "\u011B", "\u00E8", "\u00EA", "\u00EB", "\u0119",
- "\u0117", "\u0113")
+ "\u00E9", "\u011B", "\u00E8", "\u00EA", "\u00EB", "\u0119", "\u0117",
+ "\u0113")
// U+0159: "Å™" LATIN SMALL LETTER R WITH CARON
- .setMoreKeysOf("r", "4", "\u0159")
+ .setMoreKeysOf("r", "\u0159")
// U+0165: "Å¥" LATIN SMALL LETTER T WITH CARON
- .setMoreKeysOf("t", "5", "\u0165")
+ .setMoreKeysOf("t", "\u0165")
// U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
// U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
// U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
- .setMoreKeysOf("z", "6", "\u017E", "\u017A", "\u017C")
+ .setMoreKeysOf("z", "\u017E", "\u017A", "\u017C")
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u",
- "7", "\u00FA", "\u016F", "\u00FB", "\u00FC", "\u00F9", "\u016B")
+ .setMoreKeysOf("u", "\u00FA", "\u016F", "\u00FB", "\u00FC", "\u00F9", "\u016B")
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
// U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- .setMoreKeysOf("i",
- "8", "\u00ED", "\u00EE", "\u00EF", "\u00EC", "\u012F", "\u012B")
+ .setMoreKeysOf("i", "\u00ED", "\u00EE", "\u00EF", "\u00EC", "\u012F", "\u012B")
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -100,8 +98,8 @@ public final class TestsCzech extends LayoutTestsBase {
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
.setMoreKeysOf("o",
- "9", "\u00F3", "\u00F6", "\u00F4", "\u00F2", "\u00F5", "\u0153",
- "\u00F8", "\u014D")
+ "\u00F3", "\u00F6", "\u00F4", "\u00F2", "\u00F5", "\u0153", "\u00F8",
+ "\u014D")
// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
// U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
// U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDanish.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDanish.java
index 050a0c472ae901962659f05fe1b0277f3f998f78..85c63a128855b4073093dc32b1957c15b5a7068c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDanish.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDanish.java
@@ -19,7 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.LayoutBase.EuroCustomizer;
import com.android.inputmethod.keyboard.layout.Nordic;
import com.android.inputmethod.keyboard.layout.Symbols;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
@@ -38,7 +38,7 @@ public final class TestsDanish extends LayoutTestsBase {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class DanishCustomizer extends EuroLayoutCustomizer {
+ private static class DanishCustomizer extends EuroCustomizer {
public DanishCustomizer(final Locale locale) { super(locale); }
@Override
@@ -58,29 +58,28 @@ public final class TestsDanish extends LayoutTestsBase {
return builder
// U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
// U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
- .setMoreKeysOf("e", "3", "\u00E9", "\u00EB")
+ .setMoreKeysOf("e", "\u00E9", "\u00EB")
// U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
// U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
- .setMoreKeysOf("y", "6", "\u00FD", "\u00FF")
+ .setMoreKeysOf("y", "\u00FD", "\u00FF")
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FA", "\u00FC", "\u00FB", "\u00F9", "\u016B")
+ .setMoreKeysOf("u", "\u00FA", "\u00FC", "\u00FB", "\u00F9", "\u016B")
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
- .setMoreKeysOf("i", "8", "\u00ED", "\u00EF")
+ .setMoreKeysOf("i", "\u00ED", "\u00EF")
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
// U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
// U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
// U+0153: "Å“" LATIN SMALL LIGATURE OE
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
- .setMoreKeysOf("o",
- "9", "\u00F3", "\u00F4", "\u00F2", "\u00F5", "\u0153", "\u014D")
+ .setMoreKeysOf("o", "\u00F3", "\u00F4", "\u00F2", "\u00F5", "\u0153", "\u014D")
// U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- .replaceKeyOfLabel(Nordic.ROW1_11, key("\u00E5"))
+ .replaceKeyOfLabel(Nordic.ROW1_11, "\u00E5")
// U+00E6: "æ" LATIN SMALL LETTER AE
// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
.replaceKeyOfLabel(Nordic.ROW2_10, key("\u00E6", moreKey("\u00E4")))
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutch.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutch.java
index e6e3378a32a8140f727477def051ac4d1ee8a1e2..1730f66be63829fcc3c35462110229991db3dcc3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutch.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutch.java
@@ -19,7 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.LayoutBase.EuroCustomizer;
import com.android.inputmethod.keyboard.layout.Qwerty;
import com.android.inputmethod.keyboard.layout.Symbols;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
@@ -38,7 +38,7 @@ public final class TestsDutch extends LayoutTestsBase {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class DutchCustomizer extends EuroLayoutCustomizer {
+ static class DutchCustomizer extends EuroCustomizer {
public DutchCustomizer(final Locale locale) { super(locale); }
@Override
@@ -50,6 +50,17 @@ public final class TestsDutch extends LayoutTestsBase {
@Override
public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
return builder
+ // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
+ // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
+ // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
+ // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
+ // U+00E6: "æ" LATIN SMALL LETTER AE
+ // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
+ // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
+ // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
+ .setMoreKeysOf("a",
+ "\u00E1", "\u00E4", "\u00E2", "\u00E0", "\u00E6", "\u00E3", "\u00E5",
+ "\u0101")
// U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
// U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
// U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
@@ -58,16 +69,15 @@ public final class TestsDutch extends LayoutTestsBase {
// U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
// U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
.setMoreKeysOf("e",
- "3", "\u00E9", "\u00EB", "\u00EA", "\u00E8", "\u0119", "\u0117",
- "\u0113")
+ "\u00E9", "\u00EB", "\u00EA", "\u00E8", "\u0119", "\u0117", "\u0113")
// U+0133: "ij" LATIN SMALL LIGATURE IJ
- .setMoreKeysOf("y", "6", "\u0133")
+ .setMoreKeysOf("y", "\u0133")
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FA", "\u00FC", "\u00FB", "\u00F9", "\u016B")
+ .setMoreKeysOf("u", "\u00FA", "\u00FC", "\u00FB", "\u00F9", "\u016B")
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
@@ -76,8 +86,7 @@ public final class TestsDutch extends LayoutTestsBase {
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
// U+0133: "ij" LATIN SMALL LIGATURE IJ
.setMoreKeysOf("i",
- "8", "\u00ED", "\u00EF", "\u00EC", "\u00EE", "\u012F", "\u012B",
- "\u0133")
+ "\u00ED", "\u00EF", "\u00EC", "\u00EE", "\u012F", "\u012B", "\u0133")
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -87,19 +96,8 @@ public final class TestsDutch extends LayoutTestsBase {
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
.setMoreKeysOf("o",
- "9", "\u00F3", "\u00F6", "\u00F4", "\u00F2", "\u00F5", "\u0153",
- "\u00F8", "\u014D")
- // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
- // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
- // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
- // U+00E6: "æ" LATIN SMALL LETTER AE
- // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
- // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
- .setMoreKeysOf("a",
- "\u00E1", "\u00E4", "\u00E2", "\u00E0", "\u00E6", "\u00E3", "\u00E5",
- "\u0101")
+ "\u00F3", "\u00F6", "\u00F4", "\u00F2", "\u00F5", "\u0153", "\u00F8",
+ "\u014D")
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
// U+0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
.setMoreKeysOf("n", "\u00F1", "\u0144");
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutchBE.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutchBE.java
index aa706f601433d647b9f210fbf9e9a80784936215..31adf7a8d4ba14650029fb4bb2f3421c3c4bbfc1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutchBE.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutchBE.java
@@ -20,10 +20,7 @@ import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.Azerty;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import com.android.inputmethod.keyboard.layout.tests.TestsDutch.DutchCustomizer;
import java.util.Locale;
@@ -33,76 +30,8 @@ import java.util.Locale;
@SmallTest
public final class TestsDutchBE extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("nl", "BE");
- private static final LayoutBase LAYOUT = new Azerty(new DutchBECustomizer(LOCALE));
+ private static final LayoutBase LAYOUT = new Azerty(new DutchCustomizer(LOCALE));
@Override
LayoutBase getLayout() { return LAYOUT; }
-
- private static class DutchBECustomizer extends EuroLayoutCustomizer {
- public DutchBECustomizer(final Locale locale) { super(locale); }
-
- @Override
- public ExpectedKey[] getDoubleQuoteMoreKeys() { return Symbols.DOUBLE_QUOTES_L9R; }
-
- @Override
- public ExpectedKey[] getSingleQuoteMoreKeys() { return Symbols.SINGLE_QUOTES_L9R; }
-
- @Override
- public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
- return builder
- // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
- // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
- // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
- // U+00E6: "æ" LATIN SMALL LETTER AE
- // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
- // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
- .setMoreKeysOf("a",
- "1", "\u00E1", "\u00E4", "\u00E2", "\u00E0", "\u00E6", "\u00E3",
- "\u00E5", "\u0101")
- // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
- // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
- // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
- // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
- // U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
- // U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
- // U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
- .setMoreKeysOf("e",
- "3", "\u00E9", "\u00EB", "\u00EA", "\u00E8", "\u0119", "\u0117",
- "\u0113")
- // U+0133: "ij" LATIN SMALL LIGATURE IJ
- .setMoreKeysOf("y", "6", "\u0133")
- // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
- // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
- // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
- // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FA", "\u00FC", "\u00FB", "\u00F9", "\u016B")
- // U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
- // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
- // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
- // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
- // U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
- // U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- // U+0133: "ij" LATIN SMALL LIGATURE IJ
- .setMoreKeysOf("i",
- "8", "\u00ED", "\u00EF", "\u00EC", "\u00EE", "\u012F", "\u012B",
- "\u0133")
- // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
- // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
- // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
- // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
- // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
- // U+0153: "Å“" LATIN SMALL LIGATURE OE
- // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
- // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
- .setMoreKeysOf("o",
- "9", "\u00F3", "\u00F6", "\u00F4", "\u00F2", "\u00F5", "\u0153",
- "\u00F8", "\u014D")
- // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
- // U+0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
- .setMoreKeysOf("n", "\u00F1", "\u0144");
- }
- }
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUK.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUK.java
index 4789507d871aba10debaa280a5fbd9c6d490d5c3..c0dcbdc06a34ffc3dc919cc75bb585eade575d16 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUK.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUK.java
@@ -36,7 +36,7 @@ public final class TestsEnglishUK extends TestsEnglishUS {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class EnglishUKCustomizer extends EnglishUSCustomizer {
+ private static class EnglishUKCustomizer extends EnglishCustomizer {
public EnglishUKCustomizer(final Locale locale) { super(locale); }
@Override
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUS.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUS.java
index 991187aab4bbd0a4d4bd20f7a0f015e716e00b83..6ea8f60005b6928c302f004eb485d0807069499a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUS.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUS.java
@@ -19,9 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.LayoutCustomizer;
import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
import java.util.Locale;
@@ -31,63 +29,8 @@ import java.util.Locale;
@SmallTest
public class TestsEnglishUS extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("en", "US");
- private static final LayoutBase LAYOUT = new Qwerty(new EnglishUSCustomizer(LOCALE));
+ private static final LayoutBase LAYOUT = new Qwerty(new EnglishCustomizer(LOCALE));
@Override
LayoutBase getLayout() { return LAYOUT; }
-
- // TODO: Make this as generic English customizer.
- static class EnglishUSCustomizer extends LayoutCustomizer {
- public EnglishUSCustomizer(final Locale locale) { super(locale); }
-
- @Override
- public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
- return builder
- // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
- // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
- // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
- // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
- // U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
- .setMoreKeysOf("e", "3", "\u00E8", "\u00E9", "\u00EA", "\u00EB", "\u0113")
- // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
- // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
- // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
- // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FB", "\u00FC", "\u00F9", "\u00FA", "\u016B")
- // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
- // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
- // U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
- // U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
- .setMoreKeysOf("i", "8", "\u00EE", "\u00EF", "\u00ED", "\u012B", "\u00EC")
- // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
- // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
- // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
- // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
- // U+0153: "Å“" LATIN SMALL LIGATURE OE
- // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
- // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
- // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
- .setMoreKeysOf("o",
- "9", "\u00F4", "\u00F6", "\u00F2", "\u00F3", "\u0153", "\u00F8",
- "\u014D", "\u00F5")
- // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
- // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
- // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- // U+00E6: "æ" LATIN SMALL LETTER AE
- // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
- // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
- .setMoreKeysOf("a",
- "\u00E0", "\u00E1", "\u00E2", "\u00E4", "\u00E6", "\u00E3", "\u00E5",
- "\u0101")
- // U+00DF: "ß" LATIN SMALL LETTER SHARP S
- .setMoreKeysOf("s", "\u00DF")
- // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
- .setMoreKeysOf("c", "\u00E7")
- // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
- .setMoreKeysOf("n", "\u00F1");
- }
- }
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEsperanto.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEsperanto.java
index a54601b6b03dc206f98d891f656eeb1ec6da2f01..6a44187c9cc9a95ec24796530cdca2dec7675748 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEsperanto.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEsperanto.java
@@ -43,11 +43,12 @@ public class TestsEsperanto extends LayoutTestsBase {
public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
return builder
// U+015D: "Å" LATIN SMALL LETTER S WITH CIRCUMFLEX
- .replaceKeyOfLabel("q", key("\u015D", moreKey("1"), moreKey("q")))
+ .replaceKeyOfLabel("q", key("\u015D", joinMoreKeys(
+ additionalMoreKey("1"), "q")))
// U+011D: "Ä" LATIN SMALL LETTER G WITH CIRCUMFLEX
// U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX
- .replaceKeyOfLabel("w", key("\u011D",
- moreKey("2"), moreKey("w"), moreKey("\u0175")))
+ .replaceKeyOfLabel("w", key("\u011D", joinMoreKeys(
+ additionalMoreKey("2"), "w", "\u0175")))
// U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
// U+011B: "Ä›" LATIN SMALL LETTER E WITH CARON
// U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
@@ -57,25 +58,24 @@ public class TestsEsperanto extends LayoutTestsBase {
// U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
// U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
.setMoreKeysOf("e",
- "3", "\u00E9", "\u011B", "\u00E8", "\u00EA", "\u00EB", "\u0119",
- "\u0117", "\u0113")
+ "\u00E9", "\u011B", "\u00E8", "\u00EA", "\u00EB", "\u0119", "\u0117",
+ "\u0113")
// U+0159: "Å™" LATIN SMALL LETTER R WITH CARON
// U+0155: "Å•" LATIN SMALL LETTER R WITH ACUTE
// U+0157: "Å—" LATIN SMALL LETTER R WITH CEDILLA
- .setMoreKeysOf("r", "4", "\u0159", "\u0155", "\u0157")
+ .setMoreKeysOf("r", "\u0159", "\u0155", "\u0157")
// U+0165: "Å¥" LATIN SMALL LETTER T WITH CARON
// U+021B: "È›" LATIN SMALL LETTER T WITH COMMA BELOW
// U+0163: "Å£" LATIN SMALL LETTER T WITH CEDILLA
// U+0167: "ŧ" LATIN SMALL LETTER T WITH STROKE
- .setMoreKeysOf("t", "5", "\u0165", "\u021B", "\u0163", "\u0167")
+ .setMoreKeysOf("t", "\u0165", "\u021B", "\u0163", "\u0167")
// U+016D: "Å" LATIN SMALL LETTER U WITH BREVE
// U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
// U+0177: "Å·" LATIN SMALL LETTER Y WITH CIRCUMFLEX
// U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
// U+00FE: "þ" LATIN SMALL LETTER THORN
- .replaceKeyOfLabel("y", key("\u016D",
- moreKey("6"), moreKey("y"), moreKey("\u00FD"), moreKey("\u0177"),
- moreKey("\u00FF"), moreKey("\u00FE")))
+ .replaceKeyOfLabel("y", key("\u016D", joinMoreKeys(
+ additionalMoreKey("6"), "y", "\u00FD", "\u0177", "\u00FF", "\u00FE")))
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
@@ -87,8 +87,8 @@ public class TestsEsperanto extends LayoutTestsBase {
// U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
// U+00B5: "µ" MICRO SIGN
.setMoreKeysOf("u",
- "7", "\u00FA", "\u016F", "\u00FB", "\u00FC", "\u00F9", "\u016B",
- "\u0169", "\u0171", "\u0173", "\u00B5")
+ "\u00FA", "\u016F", "\u00FB", "\u00FC", "\u00F9", "\u016B", "\u0169",
+ "\u0171", "\u0173", "\u00B5")
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
@@ -99,8 +99,8 @@ public class TestsEsperanto extends LayoutTestsBase {
// U+0131: "ı" LATIN SMALL LETTER DOTLESS I
// U+0133: "ij" LATIN SMALL LIGATURE IJ
.setMoreKeysOf("i",
- "8", "\u00ED", "\u00EE", "\u00EF", "\u0129", "\u00EC", "\u012F",
- "\u012B", "\u0131", "\u0133")
+ "\u00ED", "\u00EE", "\u00EF", "\u0129", "\u00EC", "\u012F", "\u012B",
+ "\u0131", "\u0133")
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -112,8 +112,8 @@ public class TestsEsperanto extends LayoutTestsBase {
// U+0151: "Å‘" LATIN SMALL LETTER O WITH DOUBLE ACUTE
// U+00BA: "º" MASCULINE ORDINAL INDICATOR
.setMoreKeysOf("o",
- "9", "\u00F3", "\u00F6", "\u00F4", "\u00F2", "\u00F5", "\u0153",
- "\u00F8", "\u014D", "\u0151", "\u00BA")
+ "\u00F3", "\u00F6", "\u00F4", "\u00F2", "\u00F5", "\u0153", "\u00F8",
+ "\u014D", "\u0151", "\u00BA")
// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
// U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
// U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
@@ -162,7 +162,7 @@ public class TestsEsperanto extends LayoutTestsBase {
// U+0142: "Å‚" LATIN SMALL LETTER L WITH STROKE
.setMoreKeysOf("l", "\u013A", "\u013C", "\u013E", "\u0140", "\u0142")
// U+0135: "ĵ" LATIN SMALL LETTER J WITH CIRCUMFLEX
- .replaceKeyOfLabel(Spanish.ROW2_10, key("\u0135"))
+ .replaceKeyOfLabel(Spanish.ROW2_10, "\u0135")
// U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
// U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
// U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEstonianEE.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEstonianEE.java
index be3786a32d62d76cf80d8b96b408a4ef3162eb21..865e9ea17ed73641aa4206ff75edd45ef1ec131c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEstonianEE.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEstonianEE.java
@@ -19,7 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.LayoutBase.EuroCustomizer;
import com.android.inputmethod.keyboard.layout.Nordic;
import com.android.inputmethod.keyboard.layout.Symbols;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
@@ -38,7 +38,7 @@ public final class TestsEstonianEE extends LayoutTestsBase {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class EstonianEECustomizer extends EuroLayoutCustomizer {
+ private static class EstonianEECustomizer extends EuroCustomizer {
public EstonianEECustomizer(final Locale locale) {
super(locale);
}
@@ -61,18 +61,18 @@ public final class TestsEstonianEE extends LayoutTestsBase {
// U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
// U+011B: "Ä›" LATIN SMALL LETTER E WITH CARON
.setMoreKeysOf("e",
- "3", "\u0113", "\u00E8", "\u0117", "\u00E9", "\u00EA", "\u00EB",
- "\u0119", "\u011B")
+ "\u0113", "\u00E8", "\u0117", "\u00E9", "\u00EA", "\u00EB", "\u0119",
+ "\u011B")
// U+0157: "Å—" LATIN SMALL LETTER R WITH CEDILLA
// U+0159: "Å™" LATIN SMALL LETTER R WITH CARON
// U+0155: "Å•" LATIN SMALL LETTER R WITH ACUTE
- .setMoreKeysOf("r", "4", "\u0157", "\u0159", "\u0155")
+ .setMoreKeysOf("r", "\u0157", "\u0159", "\u0155")
// U+0163: "Å£" LATIN SMALL LETTER T WITH CEDILLA
// U+0165: "Å¥" LATIN SMALL LETTER T WITH CARON
- .setMoreKeysOf("t", "5", "\u0163", "\u0165")
+ .setMoreKeysOf("t", "\u0163", "\u0165")
// U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
// U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
- .setMoreKeysOf("y", "6", "\u00FD", "\u00FF")
+ .setMoreKeysOf("y", "\u00FD", "\u00FF")
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
// U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
@@ -82,8 +82,8 @@ public final class TestsEstonianEE extends LayoutTestsBase {
// U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
// U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
.setMoreKeysOf("u",
- "7", "\u00FC", "\u016B", "\u0173", "\u00F9", "\u00FA", "\u00FB",
- "\u016F", "\u0171")
+ "\u00FC", "\u016B", "\u0173", "\u00F9", "\u00FA", "\u00FB", "\u016F",
+ "\u0171")
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
// U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
@@ -92,8 +92,7 @@ public final class TestsEstonianEE extends LayoutTestsBase {
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
// U+0131: "ı" LATIN SMALL LETTER DOTLESS I
.setMoreKeysOf("i",
- "8", "\u012B", "\u00EC", "\u012F", "\u00ED", "\u00EE", "\u00EF",
- "\u0131")
+ "\u012B", "\u00EC", "\u012F", "\u00ED", "\u00EE", "\u00EF", "\u0131")
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
// U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
@@ -103,15 +102,15 @@ public final class TestsEstonianEE extends LayoutTestsBase {
// U+0151: "Å‘" LATIN SMALL LETTER O WITH DOUBLE ACUTE
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
.setMoreKeysOf("o",
- "9", "\u00F6", "\u00F5", "\u00F2", "\u00F3", "\u00F4", "\u0153",
- "\u0151", "\u00F8")
+ "\u00F6", "\u00F5", "\u00F2", "\u00F3", "\u00F4", "\u0153", "\u0151",
+ "\u00F8")
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- .replaceKeyOfLabel(Nordic.ROW1_11, key("\u00FC"))
+ .replaceKeyOfLabel(Nordic.ROW1_11, "\u00FC")
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
.replaceKeyOfLabel(Nordic.ROW2_10, key("\u00F6", moreKey("\u00F5")))
// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- .replaceKeyOfLabel(Nordic.ROW2_11, key("\u00E4"))
+ .replaceKeyOfLabel(Nordic.ROW2_11, "\u00E4")
// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
// U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
// U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFinnish.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFinnish.java
index 20ecd5164ca5dae26ab8b4b72a5ebb7df5dba4d9..ff32da11758942611b6a3de5489f3ab51a4c0956 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFinnish.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFinnish.java
@@ -19,7 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.LayoutBase.EuroCustomizer;
import com.android.inputmethod.keyboard.layout.Nordic;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
@@ -36,14 +36,14 @@ public final class TestsFinnish extends LayoutTestsBase {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class FinnishCustomizer extends EuroLayoutCustomizer {
+ private static class FinnishCustomizer extends EuroCustomizer {
public FinnishCustomizer(final Locale locale) { super(locale); }
@Override
public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
return builder
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- .setMoreKeysOf("u", "7", "\u00FC")
+ .setMoreKeysOf("u", "\u00FC")
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
// U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
@@ -52,10 +52,9 @@ public final class TestsFinnish extends LayoutTestsBase {
// U+0153: "Å“" LATIN SMALL LIGATURE OE
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
.setMoreKeysOf("o",
- "9", "\u00F8", "\u00F4", "\u00F2", "\u00F3", "\u00F5", "\u0153",
- "\u014D")
+ "\u00F8", "\u00F4", "\u00F2", "\u00F3", "\u00F5", "\u0153", "\u014D")
// U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- .replaceKeyOfLabel(Nordic.ROW1_11, key("\u00E5"))
+ .replaceKeyOfLabel(Nordic.ROW1_11, "\u00E5")
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
.replaceKeyOfLabel(Nordic.ROW2_10, key("\u00F6", moreKey("\u00F8")))
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrench.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrench.java
index 5f8ecd6e1fbbcb4f429c06239f9bca452fb11931..7ced1fb7bb8857343f5d3e43ab4d2468a5686839 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrench.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrench.java
@@ -20,8 +20,8 @@ import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.Azerty;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import com.android.inputmethod.keyboard.layout.LayoutBase.EuroCustomizer;
+import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
import java.util.Locale;
@@ -31,71 +31,25 @@ import java.util.Locale;
@SmallTest
public final class TestsFrench extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("fr");
- private static final LayoutBase LAYOUT = new Azerty(new FrenchCustomizer(LOCALE));
+ private static final LayoutBase LAYOUT = new Azerty(new FrenchEuroCustomizer(LOCALE));
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class FrenchCustomizer extends EuroLayoutCustomizer {
- public FrenchCustomizer(final Locale locale) { super(locale); }
+ static final class FrenchEuroCustomizer extends FrenchCustomizer {
+ private final EuroCustomizer mEuroCustomizer;
+
+ public FrenchEuroCustomizer(final Locale locale) {
+ super(locale);
+ mEuroCustomizer = new EuroCustomizer(locale);
+ }
+
+ @Override
+ public final ExpectedKey getCurrencyKey() { return mEuroCustomizer.getCurrencyKey(); }
@Override
- public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
- return builder
- // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
- // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
- // U+00E6: "æ" LATIN SMALL LETTER AE
- // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
- // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
- // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
- // U+00AA: "ª" FEMININE ORDINAL INDICATOR
- .setMoreKeysOf("a",
- "\u00E0", "\u00E2", "1", "\u00E6", "\u00E1", "\u00E4", "\u00E3",
- "\u00E5", "\u0101", "\u00AA")
- // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
- // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
- // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
- // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
- // U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
- // U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
- // U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
- .setMoreKeysOf("e",
- "\u00E9", "\u00E8", "\u00EA", "\u00EB", "3", "\u0119", "\u0117",
- "\u0113")
- // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
- .setMoreKeysOf("y", "6", "\u00FF")
- // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
- // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
- // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
- // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "\u00F9", "\u00FB", "7", "\u00FC", "\u00FA", "\u016B")
- // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
- // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
- // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
- // U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
- // U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
- // U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- .setMoreKeysOf("i", "\u00EE", "8", "\u00EF", "\u00EC", "\u00ED", "\u012F",
- "\u012B")
- // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
- // U+0153: "Å“" LATIN SMALL LIGATURE OE
- // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
- // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
- // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
- // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
- // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
- // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
- // U+00BA: "º" MASCULINE ORDINAL INDICATOR
- .setMoreKeysOf("o",
- "\u00F4", "\u0153", "9", "\u00F6", "\u00F2", "\u00F3", "\u00F5",
- "\u00F8", "\u014D", "\u00BA")
- // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
- // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
- // U+010D: "Ä" LATIN SMALL LETTER C WITH CARON
- .setMoreKeysOf("c", "\u00E7", "\u0107", "\u010D");
+ public final ExpectedKey[] getOtherCurrencyKeys() {
+ return mEuroCustomizer.getOtherCurrencyKeys();
}
}
}
\ No newline at end of file
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCA.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCA.java
index d6babc841614dcd6abec79a3237522ab2de34c51..9b3cd1ee2dff7c562d7266d07d278afcf7b9e228 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCA.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCA.java
@@ -19,9 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.LayoutCustomizer;
import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
import java.util.Locale;
@@ -31,71 +29,8 @@ import java.util.Locale;
@SmallTest
public final class TestsFrenchCA extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("fr", "CA");
- private static final LayoutBase LAYOUT = new Qwerty(new FrenchCACustomizer(LOCALE));
+ private static final LayoutBase LAYOUT = new Qwerty(new FrenchCustomizer(LOCALE));
@Override
LayoutBase getLayout() { return LAYOUT; }
-
- private static class FrenchCACustomizer extends LayoutCustomizer {
- public FrenchCACustomizer(final Locale locale) { super(locale); }
-
- @Override
- public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
- return builder
- // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
- // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
- // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
- // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
- // U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
- // U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
- // U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
- .setMoreKeysOf("e",
- "\u00E9", "\u00E8", "\u00EA", "\u00EB", "3", "\u0119", "\u0117",
- "\u0113")
- // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
- .setMoreKeysOf("y", "6", "\u00FF")
- // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
- // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
- // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
- // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "\u00F9", "\u00FB", "7", "\u00FC", "\u00FA", "\u016B")
- // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
- // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
- // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
- // U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
- // U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
- // U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- .setMoreKeysOf("i", "\u00EE", "8", "\u00EF", "\u00EC", "\u00ED", "\u012F",
- "\u012B")
- // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
- // U+0153: "Å“" LATIN SMALL LIGATURE OE
- // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
- // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
- // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
- // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
- // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
- // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
- // U+00BA: "º" MASCULINE ORDINAL INDICATOR
- .setMoreKeysOf("o",
- "\u00F4", "\u0153", "9", "\u00F6", "\u00F2", "\u00F3", "\u00F5",
- "\u00F8", "\u014D", "\u00BA")
- // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
- // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
- // U+00E6: "æ" LATIN SMALL LETTER AE
- // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
- // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
- // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
- // U+00AA: "ª" FEMININE ORDINAL INDICATOR
- .setMoreKeysOf("a",
- "\u00E0", "\u00E2", "\u00E6", "\u00E1", "\u00E4", "\u00E3", "\u00E5",
- "\u0101", "\u00AA")
- // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
- // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
- // U+010D: "Ä" LATIN SMALL LETTER C WITH CARON
- .setMoreKeysOf("c", "\u00E7", "\u0107", "\u010D");
- }
- }
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCH.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCH.java
index 5a56ad1d4ff412775897b47d47493ef613c60599..2598aa3bf6f59645689212e5474d6ae608d890ca 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCH.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCH.java
@@ -19,7 +19,6 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.LayoutCustomizer;
import com.android.inputmethod.keyboard.layout.Swiss;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
@@ -36,75 +35,22 @@ public final class TestsFrenchCH extends LayoutTestsBase {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class FrenchCHCustomizer extends LayoutCustomizer {
+ private static class FrenchCHCustomizer extends FrenchCustomizer {
public FrenchCHCustomizer(final Locale locale) { super(locale); }
@Override
public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
+ super.setAccentedLetters(builder);
return builder
- // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
- // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
- // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
- // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
- // U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
- // U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
- // U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
- .setMoreKeysOf("e",
- "\u00E9", "\u00E8", "\u00EA", "\u00EB", "3", "\u0119", "\u0117",
- "\u0113")
- // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
- // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
- // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
- // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "\u00F9", "\u00FB", "7", "\u00FC", "\u00FA", "\u016B")
- // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
- // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
- // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
- // U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
- // U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
- // U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- .setMoreKeysOf("i", "\u00EE", "8", "\u00EF", "\u00EC", "\u00ED", "\u012F",
- "\u012B")
- // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
- // U+0153: "Å“" LATIN SMALL LIGATURE OE
- // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
- // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
- // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
- // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
- // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
- // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
- // U+00BA: "º" MASCULINE ORDINAL INDICATOR
- .setMoreKeysOf("o",
- "\u00F4", "\u0153", "9", "\u00F6", "\u00F2", "\u00F3", "\u00F5",
- "\u00F8", "\u014D", "\u00BA")
// U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
.replaceKeyOfLabel(Swiss.ROW1_11, key("\u00E8", moreKey("\u00FC")))
- // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
- // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
- // U+00E6: "æ" LATIN SMALL LETTER AE
- // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
- // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
- // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
- // U+00AA: "ª" FEMININE ORDINAL INDICATOR
- .setMoreKeysOf("a",
- "\u00E0", "\u00E2", "\u00E6", "\u00E1", "\u00E4", "\u00E3", "\u00E5",
- "\u0101", "\u00AA")
// U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
.replaceKeyOfLabel(Swiss.ROW2_10, key("\u00E9", moreKey("\u00F6")))
// U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- .replaceKeyOfLabel(Swiss.ROW2_11, key("\u00E0", moreKey("\u00E4")))
- // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
- .setMoreKeysOf("y", "\u00FF")
- // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
- // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
- // U+010D: "Ä" LATIN SMALL LETTER C WITH CARON
- .setMoreKeysOf("c", "\u00E7", "\u0107", "\u010D");
+ .replaceKeyOfLabel(Swiss.ROW2_11, key("\u00E0", moreKey("\u00E4")));
}
}
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchQwertz.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchQwertz.java
index 0582b0cf0fe174189d04d4ce1b62063fe92d54be..6ab28704a6f2a806afb81ab1bbe6e793391b2663 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchQwertz.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchQwertz.java
@@ -19,9 +19,8 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
import com.android.inputmethod.keyboard.layout.Qwertz;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import com.android.inputmethod.keyboard.layout.tests.TestsFrench.FrenchEuroCustomizer;
import java.util.Locale;
@@ -31,71 +30,8 @@ import java.util.Locale;
@SmallTest
public final class TestsFrenchQwertz extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("fr");
- private static final LayoutBase LAYOUT = new Qwertz(new FrenchQwertzCustomizer(LOCALE));
+ private static final LayoutBase LAYOUT = new Qwertz(new FrenchEuroCustomizer(LOCALE));
@Override
LayoutBase getLayout() { return LAYOUT; }
-
- private static class FrenchQwertzCustomizer extends EuroLayoutCustomizer {
- public FrenchQwertzCustomizer(final Locale locale) { super(locale); }
-
- @Override
- public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
- return builder
- // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
- // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
- // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
- // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
- // U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
- // U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
- // U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
- .setMoreKeysOf("e",
- "\u00E9", "\u00E8", "\u00EA", "\u00EB", "3", "\u0119", "\u0117",
- "\u0113")
- // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
- // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
- // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
- // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "\u00F9", "\u00FB", "7", "\u00FC", "\u00FA", "\u016B")
- // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
- // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
- // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
- // U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
- // U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
- // U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- .setMoreKeysOf("i", "\u00EE", "8", "\u00EF", "\u00EC", "\u00ED", "\u012F",
- "\u012B")
- // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
- // U+0153: "Å“" LATIN SMALL LIGATURE OE
- // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
- // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
- // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
- // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
- // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
- // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
- // U+00BA: "º" MASCULINE ORDINAL INDICATOR
- .setMoreKeysOf("o",
- "\u00F4", "\u0153", "9", "\u00F6", "\u00F2", "\u00F3", "\u00F5",
- "\u00F8", "\u014D", "\u00BA")
- // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
- // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
- // U+00E6: "æ" LATIN SMALL LETTER AE
- // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
- // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
- // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
- // U+00AA: "ª" FEMININE ORDINAL INDICATOR
- .setMoreKeysOf("a",
- "\u00E0", "\u00E2", "\u00E6", "\u00E1", "\u00E4", "\u00E3", "\u00E5",
- "\u0101", "\u00AA")
- // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
- .setMoreKeysOf("y", "\u00FF")
- // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
- // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
- // U+010D: "Ä" LATIN SMALL LETTER C WITH CARON
- .setMoreKeysOf("c", "\u00E7", "\u0107", "\u010D");
- }
- }
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGerman.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGerman.java
index 7c12b37de666bf097fcebc14429f63bf279efba9..6f75711978a39c02dbb776f99db1e45820b1006b 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGerman.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGerman.java
@@ -19,11 +19,9 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.LayoutBase.EuroCustomizer;
import com.android.inputmethod.keyboard.layout.Qwertz;
-import com.android.inputmethod.keyboard.layout.Symbols;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
import java.util.Locale;
@@ -33,70 +31,25 @@ import java.util.Locale;
@SmallTest
public final class TestsGerman extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("de");
- private static final LayoutBase LAYOUT = new Qwertz(new GermanCustomizer(LOCALE));
+ private static final LayoutBase LAYOUT = new Qwertz(new GermanEuroCustomizer(LOCALE));
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class GermanCustomizer extends EuroLayoutCustomizer {
- public GermanCustomizer(final Locale locale) { super(locale); }
+ static class GermanEuroCustomizer extends GermanCustomizer {
+ final EuroCustomizer mEuroCustomizer;
- @Override
- public ExpectedKey[] getDoubleQuoteMoreKeys() { return Symbols.DOUBLE_QUOTES_R9L; }
-
- @Override
- public ExpectedKey[] getSingleQuoteMoreKeys() { return Symbols.SINGLE_QUOTES_R9L; }
-
- @Override
- public ExpectedKey[] getDoubleAngleQuoteKeys() { return Symbols.DOUBLE_ANGLE_QUOTES_RL; }
+ public GermanEuroCustomizer(final Locale locale) {
+ super(locale);
+ mEuroCustomizer = new EuroCustomizer(locale);
+ }
@Override
- public ExpectedKey[] getSingleAngleQuoteKeys() { return Symbols.SINGLE_ANGLE_QUOTES_RL; }
+ public ExpectedKey getCurrencyKey() { return mEuroCustomizer.getCurrencyKey(); }
@Override
- public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
- return builder
- // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
- // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
- // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
- // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
- // U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
- .setMoreKeysOf("e", "3", "\u00E9", "\u00E8", "\u00EA", "\u00EB", "\u0117")
- // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
- // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
- // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
- // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FC", "\u00FB", "\u00F9", "\u00FA", "\u016B")
- // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
- // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
- // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
- // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
- // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
- // U+0153: "Å“" LATIN SMALL LIGATURE OE
- // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
- // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
- .setMoreKeysOf("o",
- "9", "\u00F6", "\u00F4", "\u00F2", "\u00F3", "\u00F5", "\u0153",
- "\u00F8", "\u014D")
- // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
- // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
- // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
- // U+00E6: "æ" LATIN SMALL LETTER AE
- // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
- // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
- .setMoreKeysOf("a",
- "\u00E4", "\u00E2", "\u00E0", "\u00E1", "\u00E6", "\u00E3", "\u00E5",
- "\u0101")
- // U+00DF: "ß" LATIN SMALL LETTER SHARP S
- // U+015B: "Å›" LATIN SMALL LETTER S WITH ACUTE
- // U+0161: "Å¡" LATIN SMALL LETTER S WITH CARON
- .setMoreKeysOf("s", "\u00DF", "\u015B", "\u0161")
- // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
- // U+0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
- .setMoreKeysOf("n", "\u00F1", "\u0144");
+ public ExpectedKey[] getOtherCurrencyKeys() {
+ return mEuroCustomizer.getOtherCurrencyKeys();
}
}
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanCH.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanCH.java
index 001c3c40a94e13fc4e6d0c7e8419c96fc6c363a1..7deb00bb45d3e5521c4df3a3041f5b5c7a738b7e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanCH.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanCH.java
@@ -19,10 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.LayoutCustomizer;
import com.android.inputmethod.keyboard.layout.Swiss;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
import java.util.Locale;
@@ -38,74 +35,22 @@ public final class TestsGermanCH extends LayoutTestsBase {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class GermanCHCustomizer extends LayoutCustomizer {
+ private static class GermanCHCustomizer extends GermanCustomizer {
public GermanCHCustomizer(final Locale locale) { super(locale); }
- @Override
- public ExpectedKey[] getDoubleQuoteMoreKeys() { return Symbols.DOUBLE_QUOTES_R9L; }
-
- @Override
- public ExpectedKey[] getSingleQuoteMoreKeys() { return Symbols.SINGLE_QUOTES_R9L; }
-
- @Override
- public ExpectedKey[] getDoubleAngleQuoteKeys() { return Symbols.DOUBLE_ANGLE_QUOTES_RL; }
-
- @Override
- public ExpectedKey[] getSingleAngleQuoteKeys() { return Symbols.SINGLE_ANGLE_QUOTES_RL; }
-
@Override
public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
+ super.setAccentedLetters(builder);
return builder
- // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
- // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
- // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
- // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
- // U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
- .setMoreKeysOf("e", "3", "\u00E9", "\u00E8", "\u00EA", "\u00EB", "\u0117")
- // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
- // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
- // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
- // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FC", "\u00FB", "\u00F9", "\u00FA", "\u016B")
- // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
- // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
- // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
- // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
- // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
- // U+0153: "Å“" LATIN SMALL LIGATURE OE
- // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
- // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
- .setMoreKeysOf("o",
- "9", "\u00F6", "\u00F4", "\u00F2", "\u00F3", "\u00F5", "\u0153",
- "\u00F8", "\u014D")
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
// U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
.replaceKeyOfLabel(Swiss.ROW1_11, key("\u00FC", moreKey("\u00E8")))
- // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
- // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
- // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
- // U+00E6: "æ" LATIN SMALL LETTER AE
- // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
- // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
- .setMoreKeysOf("a",
- "\u00E4", "\u00E2", "\u00E0", "\u00E1", "\u00E6", "\u00E3", "\u00E5",
- "\u0101")
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
.replaceKeyOfLabel(Swiss.ROW2_10, key("\u00F6", moreKey("\u00E9")))
// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
// U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
- .replaceKeyOfLabel(Swiss.ROW2_11, key("\u00E4", moreKey("\u00E0")))
- // U+00DF: "ß" LATIN SMALL LETTER SHARP S
- // U+015B: "Å›" LATIN SMALL LETTER S WITH ACUTE
- // U+0161: "Å¡" LATIN SMALL LETTER S WITH CARON
- .setMoreKeysOf("s", "\u00DF", "\u015B", "\u0161")
- // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
- // U+0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
- .setMoreKeysOf("n", "\u00F1", "\u0144");
+ .replaceKeyOfLabel(Swiss.ROW2_11, key("\u00E4", moreKey("\u00E0")));
}
}
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanQwerty.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanQwerty.java
index 618485dba270d5d7e09e6b2bd440067685cd88dd..19ae5a3f5077a9d7da19a1bb4fe8df686cbe2ac2 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanQwerty.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanQwerty.java
@@ -19,11 +19,8 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import com.android.inputmethod.keyboard.layout.tests.TestsGerman.GermanEuroCustomizer;
import java.util.Locale;
@@ -33,70 +30,8 @@ import java.util.Locale;
@SmallTest
public final class TestsGermanQwerty extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("de");
- private static final LayoutBase LAYOUT = new Qwerty(new GermanQwertyCustomizer(LOCALE));
+ private static final LayoutBase LAYOUT = new Qwerty(new GermanEuroCustomizer(LOCALE));
@Override
LayoutBase getLayout() { return LAYOUT; }
-
- private static class GermanQwertyCustomizer extends EuroLayoutCustomizer {
- public GermanQwertyCustomizer(final Locale locale) { super(locale); }
-
- @Override
- public ExpectedKey[] getDoubleQuoteMoreKeys() { return Symbols.DOUBLE_QUOTES_R9L; }
-
- @Override
- public ExpectedKey[] getSingleQuoteMoreKeys() { return Symbols.SINGLE_QUOTES_R9L; }
-
- @Override
- public ExpectedKey[] getDoubleAngleQuoteKeys() { return Symbols.DOUBLE_ANGLE_QUOTES_RL; }
-
- @Override
- public ExpectedKey[] getSingleAngleQuoteKeys() { return Symbols.SINGLE_ANGLE_QUOTES_RL; }
-
- @Override
- public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
- return builder
- // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
- // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
- // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
- // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
- // U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
- .setMoreKeysOf("e", "3", "\u00E9", "\u00E8", "\u00EA", "\u00EB", "\u0117")
- // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
- // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
- // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
- // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FC", "\u00FB", "\u00F9", "\u00FA", "\u016B")
- // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
- // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
- // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
- // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
- // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
- // U+0153: "Å“" LATIN SMALL LIGATURE OE
- // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
- // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
- .setMoreKeysOf("o",
- "9", "\u00F6", "\u00F4", "\u00F2", "\u00F3", "\u00F5", "\u0153",
- "\u00F8", "\u014D")
- // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
- // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
- // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
- // U+00E6: "æ" LATIN SMALL LETTER AE
- // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
- // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
- .setMoreKeysOf("a",
- "\u00E4", "\u00E2", "\u00E0", "\u00E1", "\u00E6", "\u00E3", "\u00E5",
- "\u0101")
- // U+00DF: "ß" LATIN SMALL LETTER SHARP S
- // U+015B: "Å›" LATIN SMALL LETTER S WITH ACUTE
- // U+0161: "Å¡" LATIN SMALL LETTER S WITH CARON
- .setMoreKeysOf("s", "\u00DF", "\u015B", "\u0161")
- // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
- // U+0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
- .setMoreKeysOf("n", "\u00F1", "\u0144");
- }
- }
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHungarian.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHungarian.java
index 942c07a2a13a96444fbbc8b7e0096854eab3f6ef..efc95dcf99616d8a63adb60c071981b184610533 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHungarian.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHungarian.java
@@ -64,24 +64,21 @@ public final class TestsHungarian extends LayoutTestsBase {
// U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
// U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
.setMoreKeysOf("e",
- "3", "\u00E9", "\u00E8", "\u00EA", "\u00EB", "\u0119", "\u0117",
- "\u0113")
+ "\u00E9", "\u00E8", "\u00EA", "\u00EB", "\u0119", "\u0117", "\u0113")
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
// U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FA", "\u00FC", "\u0171", "\u00FB", "\u00F9",
- "\u016B")
+ .setMoreKeysOf("u", "\u00FA", "\u00FC", "\u0171", "\u00FB", "\u00F9", "\u016B")
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
// U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- .setMoreKeysOf("i", "8", "\u00ED", "\u00EE", "\u00EF", "\u00EC", "\u012F",
- "\u012B")
+ .setMoreKeysOf("i", "\u00ED", "\u00EE", "\u00EF", "\u00EC", "\u012F", "\u012B")
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+0151: "Å‘" LATIN SMALL LETTER O WITH DOUBLE ACUTE
@@ -92,8 +89,8 @@ public final class TestsHungarian extends LayoutTestsBase {
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
.setMoreKeysOf("o",
- "9", "\u00F3", "\u00F6", "\u0151", "\u00F4", "\u00F2", "\u00F5",
- "\u0153", "\u00F8", "\u014D")
+ "\u00F3", "\u00F6", "\u0151", "\u00F4", "\u00F2", "\u00F5", "\u0153",
+ "\u00F8", "\u014D")
// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
// U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
// U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsIcelandic.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsIcelandic.java
index c10c1a9051c4bc81a14ca1b1456cb15fe9defadf..62b111e6a2bdf1844be220cf420c3fb03ae6fa5f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsIcelandic.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsIcelandic.java
@@ -58,27 +58,25 @@ public final class TestsIcelandic extends LayoutTestsBase {
// U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
// U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
.setMoreKeysOf("e",
- "3", "\u00E9", "\u00EB", "\u00E8", "\u00EA", "\u0119", "\u0117",
- "\u0113")
+ "\u00E9", "\u00EB", "\u00E8", "\u00EA", "\u0119", "\u0117", "\u0113")
// U+00FE: "þ" LATIN SMALL LETTER THORN
- .setMoreKeysOf("t", "5", "\u00FE")
+ .setMoreKeysOf("t", "\u00FE")
// U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
// U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
- .setMoreKeysOf("y", "6", "\u00FD", "\u00FF")
+ .setMoreKeysOf("y", "\u00FD", "\u00FF")
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FA", "\u00FC", "\u00FB", "\u00F9", "\u016B")
+ .setMoreKeysOf("u", "\u00FA", "\u00FC", "\u00FB", "\u00F9", "\u016B")
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
// U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
// U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- .setMoreKeysOf("i", "8", "\u00ED", "\u00EF", "\u00EE", "\u00EC", "\u012F",
- "\u012B")
+ .setMoreKeysOf("i", "\u00ED", "\u00EF", "\u00EE", "\u00EC", "\u012F", "\u012B")
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -88,8 +86,8 @@ public final class TestsIcelandic extends LayoutTestsBase {
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
.setMoreKeysOf("o",
- "9", "\u00F3", "\u00F6", "\u00F4", "\u00F2", "\u00F5", "\u0153",
- "\u00F8", "\u014D")
+ "\u00F3", "\u00F6", "\u00F4", "\u00F2", "\u00F5", "\u0153", "\u00F8",
+ "\u014D")
// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
// U+00E6: "æ" LATIN SMALL LETTER AE
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsItalian.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsItalian.java
index 1ba54b1e352f910e5120dfdfa3cd82b5efa30d4d..4a2200364e5c5b841439609230b88a3d8fd42546 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsItalian.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsItalian.java
@@ -19,7 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.LayoutBase.EuroCustomizer;
import com.android.inputmethod.keyboard.layout.Qwerty;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
@@ -36,7 +36,7 @@ public final class TestsItalian extends LayoutTestsBase {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class ItalianCustomizer extends EuroLayoutCustomizer {
+ private static class ItalianCustomizer extends EuroCustomizer {
public ItalianCustomizer(final Locale locale) { super(locale); }
@Override
@@ -50,22 +50,20 @@ public final class TestsItalian extends LayoutTestsBase {
// U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
// U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
.setMoreKeysOf("e",
- "3", "\u00E8", "\u00E9", "\u00EA", "\u00EB", "\u0119", "\u0117",
- "\u0113")
+ "\u00E8", "\u00E9", "\u00EA", "\u00EB", "\u0119", "\u0117", "\u0113")
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00F9", "\u00FA", "\u00FB", "\u00FC", "\u016B")
+ .setMoreKeysOf("u", "\u00F9", "\u00FA", "\u00FB", "\u00FC", "\u016B")
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
// U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- .setMoreKeysOf("i", "8", "\u00EC", "\u00ED", "\u00EE", "\u00EF", "\u012F",
- "\u012B")
+ .setMoreKeysOf("i", "\u00EC", "\u00ED", "\u00EE", "\u00EF", "\u012F", "\u012B")
// U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -76,8 +74,8 @@ public final class TestsItalian extends LayoutTestsBase {
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
// U+00BA: "º" MASCULINE ORDINAL INDICATOR
.setMoreKeysOf("o",
- "9", "\u00F2", "\u00F3", "\u00F4", "\u00F6", "\u00F5", "\u0153",
- "\u00F8", "\u014D", "\u00BA")
+ "\u00F2", "\u00F3", "\u00F4", "\u00F6", "\u00F5", "\u0153", "\u00F8",
+ "\u014D", "\u00BA")
// U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
// U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKazakh.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKazakh.java
index ec08a5a04174c856683e480ad032487c01b8a234..d255a0fa9fc32fee784343581ade8fc9e8f52140 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKazakh.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKazakh.java
@@ -45,21 +45,21 @@ public final class TestsKazakh extends LayoutTestsBase {
// U+0443: "у" CYRILLIC SMALL LETTER U
// U+04AF: "Ò¯" CYRILLIC SMALL LETTER STRAIGHT U
// U+04B1: "Ò±" CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
- .setMoreKeysOf("\u0443", "3", "\u04AF", "\u04B1")
+ .setMoreKeysOf("\u0443", "\u04AF", "\u04B1")
// U+043A: "к" CYRILLIC SMALL LETTER KA
// U+049B: "Ò›" CYRILLIC SMALL LETTER KA WITH DESCENDER
- .setMoreKeysOf("\u043A", "4", "\u049B")
+ .setMoreKeysOf("\u043A", "\u049B")
// U+0435: "е" CYRILLIC SMALL LETTER IE
// U+0451: "Ñ‘" CYRILLIC SMALL LETTER IO
- .setMoreKeysOf("\u0435", "5", "\u0451")
+ .setMoreKeysOf("\u0435", "\u0451")
// U+043D: "н" CYRILLIC SMALL LETTER EN
// U+04A3: "Ò£" CYRILLIC SMALL LETTER EN WITH DESCENDER
- .setMoreKeysOf("\u043D", "6", "\u04A3")
+ .setMoreKeysOf("\u043D", "\u04A3")
// U+0433: "г" CYRILLIC SMALL LETTER GHE
// U+0493: "Ò“" CYRILLIC SMALL LETTER GHE WITH STROKE
- .setMoreKeysOf("\u0433", "7", "\u0493")
+ .setMoreKeysOf("\u0433", "\u0493")
// U+0449: "щ" CYRILLIC SMALL LETTER SHCHA
- .replaceKeyOfLabel(EastSlavic.ROW1_9, key("\u0449", moreKey("9")))
+ .replaceKeyOfLabel(EastSlavic.ROW1_9, key("\u0449", additionalMoreKey("9")))
// U+044B: "Ñ‹" CYRILLIC SMALL LETTER YERU
// U+0456: "Ñ–" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
.replaceKeyOfLabel(EastSlavic.ROW2_2, key("\u044B", moreKey("\u0456")))
@@ -73,7 +73,7 @@ public final class TestsKazakh extends LayoutTestsBase {
// U+04BB: "Ò»" CYRILLIC SMALL LETTER SHHA
.replaceKeyOfLabel(EastSlavic.ROW2_11, key("\u044D", moreKey("\u04BB")))
// U+0438: "и" CYRILLIC SMALL LETTER I
- .replaceKeyOfLabel(EastSlavic.ROW3_5, key("\u0438"))
+ .replaceKeyOfLabel(EastSlavic.ROW3_5, "\u0438")
// U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN
// U+044A: "ÑŠ" CYRILLIC SMALL LETTER HARD SIGN
.setMoreKeysOf("\u044C", "\u044A");
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKyrgyz.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKyrgyz.java
index ccacf3f06460d54859f5f8842981acf6b9913334..9797b4ba9408dd9d27aca233271d10b1e1bf9b07 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKyrgyz.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKyrgyz.java
@@ -44,24 +44,24 @@ public final class TestsKyrgyz extends LayoutTestsBase {
return builder
// U+0443: "у" CYRILLIC SMALL LETTER U
// U+04AF: "Ò¯" CYRILLIC SMALL LETTER STRAIGHT U
- .setMoreKeysOf("\u0443", "3", "\u04AF")
+ .setMoreKeysOf("\u0443", "\u04AF")
// U+0435: "е" CYRILLIC SMALL LETTER IE
// U+0451: "Ñ‘" CYRILLIC SMALL LETTER IO
- .setMoreKeysOf("\u0435", "5", "\u0451")
+ .setMoreKeysOf("\u0435", "\u0451")
// U+043D: "н" CYRILLIC SMALL LETTER EN
// U+04A3: "Ò£" CYRILLIC SMALL LETTER EN WITH DESCENDER
- .setMoreKeysOf("\u043D", "6", "\u04A3")
+ .setMoreKeysOf("\u043D", "\u04A3")
// U+0449: "щ" CYRILLIC SMALL LETTER SHCHA
- .replaceKeyOfLabel(EastSlavic.ROW1_9, key("\u0449", moreKey("9")))
+ .replaceKeyOfLabel(EastSlavic.ROW1_9, key("\u0449", additionalMoreKey("9")))
// U+044B: "Ñ‹" CYRILLIC SMALL LETTER YERU
- .replaceKeyOfLabel(EastSlavic.ROW2_2, key("\u044B"))
+ .replaceKeyOfLabel(EastSlavic.ROW2_2, "\u044B")
// U+043E: "о" CYRILLIC SMALL LETTER O
// U+04E9: "Ó©" CYRILLIC SMALL LETTER BARRED O
.setMoreKeysOf("\u043E", "\u04E9")
// U+044D: "Ñ" CYRILLIC SMALL LETTER E
- .replaceKeyOfLabel(EastSlavic.ROW2_11, key("\u044D"))
+ .replaceKeyOfLabel(EastSlavic.ROW2_11, "\u044D")
// U+0438: "и" CYRILLIC SMALL LETTER I
- .replaceKeyOfLabel(EastSlavic.ROW3_5, key("\u0438"))
+ .replaceKeyOfLabel(EastSlavic.ROW3_5, "\u0438")
// U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN
// U+044A: "ÑŠ" CYRILLIC SMALL LETTER HARD SIGN
.setMoreKeysOf("\u044C", "\u044A");
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLatvian.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLatvian.java
index 0f0785440001f1da3de3e5c0b925d2b7eea593eb..dc1736c6db0f7b62f84fae7b67489b894b12246c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLatvian.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLatvian.java
@@ -59,18 +59,18 @@ public final class TestsLatvian extends LayoutTestsBase {
// U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
// U+011B: "Ä›" LATIN SMALL LETTER E WITH CARON
.setMoreKeysOf("e",
- "3", "\u0113", "\u0117", "\u00E8", "\u00E9", "\u00EA", "\u00EB",
- "\u0119", "\u011B")
+ "\u0113", "\u0117", "\u00E8", "\u00E9", "\u00EA", "\u00EB", "\u0119",
+ "\u011B")
// U+0157: "Å—" LATIN SMALL LETTER R WITH CEDILLA
// U+0159: "Å™" LATIN SMALL LETTER R WITH CARON
// U+0155: "Å•" LATIN SMALL LETTER R WITH ACUTE
- .setMoreKeysOf("r", "4", "\u0157", "\u0159", "\u0155")
+ .setMoreKeysOf("r", "\u0157", "\u0159", "\u0155")
// U+0163: "Å£" LATIN SMALL LETTER T WITH CEDILLA
// U+0165: "Å¥" LATIN SMALL LETTER T WITH CARON
- .setMoreKeysOf("t", "5", "\u0163", "\u0165")
+ .setMoreKeysOf("t", "\u0163", "\u0165")
// U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
// U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
- .setMoreKeysOf("y", "6", "\u00FD", "\u00FF")
+ .setMoreKeysOf("y", "\u00FD", "\u00FF")
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
// U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
@@ -80,8 +80,8 @@ public final class TestsLatvian extends LayoutTestsBase {
// U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
// U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
.setMoreKeysOf("u",
- "7", "\u016B", "\u0173", "\u00F9", "\u00FA", "\u00FB", "\u00FC",
- "\u016F", "\u0171")
+ "\u016B", "\u0173", "\u00F9", "\u00FA", "\u00FB", "\u00FC", "\u016F",
+ "\u0171")
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
// U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
@@ -90,8 +90,7 @@ public final class TestsLatvian extends LayoutTestsBase {
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
// U+0131: "ı" LATIN SMALL LETTER DOTLESS I
.setMoreKeysOf("i",
- "8", "\u012B", "\u012F", "\u00EC", "\u00ED", "\u00EE", "\u00EF",
- "\u0131")
+ "\u012B", "\u012F", "\u00EC", "\u00ED", "\u00EE", "\u00EF", "\u0131")
// U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -101,8 +100,8 @@ public final class TestsLatvian extends LayoutTestsBase {
// U+0151: "Å‘" LATIN SMALL LETTER O WITH DOUBLE ACUTE
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
.setMoreKeysOf("o",
- "9", "\u00F2", "\u00F3", "\u00F4", "\u00F5", "\u00F6", "\u0153",
- "\u0151", "\u00F8")
+ "\u00F2", "\u00F3", "\u00F4", "\u00F5", "\u00F6", "\u0153", "\u0151",
+ "\u00F8")
// U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
// U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLithuanian.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLithuanian.java
index 9094db91a1d1714bb3264ffea89f8c5887eb7dd8..55ac37a3712239cb71bc2ba61c1f9725e1f423be 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLithuanian.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLithuanian.java
@@ -59,18 +59,18 @@ public final class TestsLithuanian extends LayoutTestsBase {
// U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
// U+011B: "Ä›" LATIN SMALL LETTER E WITH CARON
.setMoreKeysOf("e",
- "3", "\u0117", "\u0119", "\u0113", "\u00E8", "\u00E9", "\u00EA",
- "\u00EB", "\u011B")
+ "\u0117", "\u0119", "\u0113", "\u00E8", "\u00E9", "\u00EA", "\u00EB",
+ "\u011B")
// U+0157: "Å—" LATIN SMALL LETTER R WITH CEDILLA
// U+0159: "Å™" LATIN SMALL LETTER R WITH CARON
// U+0155: "Å•" LATIN SMALL LETTER R WITH ACUTE
- .setMoreKeysOf("r", "4", "\u0157", "\u0159", "\u0155")
+ .setMoreKeysOf("r", "\u0157", "\u0159", "\u0155")
// U+0163: "Å£" LATIN SMALL LETTER T WITH CEDILLA
// U+0165: "Å¥" LATIN SMALL LETTER T WITH CARON
- .setMoreKeysOf("t", "5", "\u0163", "\u0165")
+ .setMoreKeysOf("t", "\u0163", "\u0165")
// U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
// U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
- .setMoreKeysOf("y", "6", "\u00FD", "\u00FF")
+ .setMoreKeysOf("y", "\u00FD", "\u00FF")
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
// U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
@@ -81,8 +81,8 @@ public final class TestsLithuanian extends LayoutTestsBase {
// U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
// U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
.setMoreKeysOf("u",
- "7", "\u016B", "\u0173", "\u00FC", "\u016B", "\u00F9", "\u00FA",
- "\u00FB", "\u016F", "\u0171")
+ "\u016B", "\u0173", "\u00FC", "\u016B", "\u00F9", "\u00FA", "\u00FB",
+ "\u016F", "\u0171")
// U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
@@ -91,8 +91,7 @@ public final class TestsLithuanian extends LayoutTestsBase {
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
// U+0131: "ı" LATIN SMALL LETTER DOTLESS I
.setMoreKeysOf("i",
- "8", "\u012F", "\u012B", "\u00EC", "\u00ED", "\u00EE", "\u00EF",
- "\u0131")
+ "\u012F", "\u012B", "\u00EC", "\u00ED", "\u00EE", "\u00EF", "\u0131")
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
// U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
@@ -102,8 +101,8 @@ public final class TestsLithuanian extends LayoutTestsBase {
// U+0151: "Å‘" LATIN SMALL LETTER O WITH DOUBLE ACUTE
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
.setMoreKeysOf("o",
- "9", "\u00F6", "\u00F5", "\u00F2", "\u00F3", "\u00F4", "\u0153",
- "\u0151", "\u00F8")
+ "\u00F6", "\u00F5", "\u00F2", "\u00F3", "\u00F4", "\u0153", "\u0151",
+ "\u00F8")
// U+0105: "Ä…" LATIN SMALL LETTER A WITH OGONEK
// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
// U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMacedonian.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMacedonian.java
index 5202698304492ee20bcbc6ae40b1e8ef3dc46dbb..1d7d8565020d011d23f7684a615ed9d898a9a6fe 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMacedonian.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMacedonian.java
@@ -52,18 +52,18 @@ public final class TestsMacedonian extends LayoutTestsBase {
return builder
// U+0435: "е" CYRILLIC SMALL LETTER IE
// U+0450: "Ñ" CYRILLIC SMALL LETTER IE WITH GRAVE
- .setMoreKeysOf("\u0435", "3", "\u0450")
+ .setMoreKeysOf("\u0435", "\u0450")
// U+0455: "Ñ•" CYRILLIC SMALL LETTER DZE
- .replaceKeyOfLabel(SouthSlavic.ROW1_6, key("\u0455", moreKey("6")))
+ .replaceKeyOfLabel(SouthSlavic.ROW1_6, key("\u0455", additionalMoreKey("6")))
// U+0438: "и" CYRILLIC SMALL LETTER I
// U+045D: "Ñ" CYRILLIC SMALL LETTER I WITH GRAVE
- .setMoreKeysOf("\u0438", "8", "\u045D")
+ .setMoreKeysOf("\u0438", "\u045D")
// U+045C: "ќ" CYRILLIC SMALL LETTER KJE
- .replaceKeyOfLabel(SouthSlavic.ROW2_11, key("\u045C"))
+ .replaceKeyOfLabel(SouthSlavic.ROW2_11, "\u045C")
// U+0437: "з" CYRILLIC SMALL LETTER ZE
- .replaceKeyOfLabel(SouthSlavic.ROW3_1, key("\u0437"))
+ .replaceKeyOfLabel(SouthSlavic.ROW3_1, "\u0437")
// U+0453: "Ñ“" CYRILLIC SMALL LETTER GJE
- .replaceKeyOfLabel(SouthSlavic.ROW3_8, key("\u0453"));
+ .replaceKeyOfLabel(SouthSlavic.ROW3_8, "\u0453");
}
}
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguage.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguage.java
index 76a3d4df48d6c6a9b0d12b745817e0f776fa27a0..480f5f25bee84660066d7bbdb25d80909f4c9557 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguage.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguage.java
@@ -43,7 +43,7 @@ public final class TestsNoLanguage extends LayoutTestsBase {
public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
return builder
// U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX
- .setMoreKeysOf("w", "2", "\u0175")
+ .setMoreKeysOf("w", "\u0175")
// U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
// U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
// U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
@@ -54,22 +54,22 @@ public final class TestsNoLanguage extends LayoutTestsBase {
// U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
// U+011B: "Ä›" LATIN SMALL LETTER E WITH CARON
.setMoreKeysOf("e",
- "3", "\u00E8", "\u00E9", "\u00EA", "\u00EB", "\u0113", "\u0115",
- "\u0117", "\u0119", "\u011B")
+ "\u00E8", "\u00E9", "\u00EA", "\u00EB", "\u0113", "\u0115", "\u0117",
+ "\u0119", "\u011B")
// U+0155: "Å•" LATIN SMALL LETTER R WITH ACUTE
// U+0157: "Å—" LATIN SMALL LETTER R WITH CEDILLA
// U+0159: "Å™" LATIN SMALL LETTER R WITH CARON
- .setMoreKeysOf("r", "4", "\u0155", "\u0157", "\u0159")
+ .setMoreKeysOf("r", "\u0155", "\u0157", "\u0159")
// U+00FE: "þ" LATIN SMALL LETTER THORN
// U+0163: "Å£" LATIN SMALL LETTER T WITH CEDILLA
// U+0165: "Å¥" LATIN SMALL LETTER T WITH CARON
// U+0167: "ŧ" LATIN SMALL LETTER T WITH STROKE
- .setMoreKeysOf("t", "5", "\u00FE", "\u0163", "\u0165", "\u0167")
+ .setMoreKeysOf("t", "\u00FE", "\u0163", "\u0165", "\u0167")
// U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
// U+0177: "Å·" LATIN SMALL LETTER Y WITH CIRCUMFLEX
// U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
// U+0133: "ij" LATIN SMALL LIGATURE IJ
- .setMoreKeysOf("y", "6", "\u00FD", "\u0177", "\u00FF", "\u0133")
+ .setMoreKeysOf("y", "\u00FD", "\u0177", "\u00FF", "\u0133")
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
@@ -81,8 +81,8 @@ public final class TestsNoLanguage extends LayoutTestsBase {
// U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
// U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
.setMoreKeysOf("u",
- "7", "\u00F9", "\u00FA", "\u00FB", "\u00FC", "\u0169", "\u016B",
- "\u016D", "\u016F", "\u0171", "\u0173")
+ "\u00F9", "\u00FA", "\u00FB", "\u00FC", "\u0169", "\u016B", "\u016D",
+ "\u016F", "\u0171", "\u0173")
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
@@ -94,8 +94,8 @@ public final class TestsNoLanguage extends LayoutTestsBase {
// U+0131: "ı" LATIN SMALL LETTER DOTLESS I
// U+0133: "ij" LATIN SMALL LIGATURE IJ
.setMoreKeysOf("i",
- "8", "\u00EC", "\u00ED", "\u00EE", "\u00EF", "\u0129", "\u012B",
- "\u012D", "\u012F", "\u0131", "\u0133")
+ "\u00EC", "\u00ED", "\u00EE", "\u00EF", "\u0129", "\u012B", "\u012D",
+ "\u012F", "\u0131", "\u0133")
// U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -108,8 +108,8 @@ public final class TestsNoLanguage extends LayoutTestsBase {
// U+0153: "Å“" LATIN SMALL LIGATURE OE
// U+00BA: "º" MASCULINE ORDINAL INDICATOR
.setMoreKeysOf("o",
- "9", "\u00F2", "\u00F3", "\u00F4", "\u00F5", "\u00F6", "\u00F8",
- "\u014D", "\u014F", "\u0151", "\u0153", "\u00BA")
+ "\u00F2", "\u00F3", "\u00F4", "\u00F5", "\u00F6", "\u00F8", "\u014D",
+ "\u014F", "\u0151", "\u0153", "\u00BA")
// U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
// U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNorwegian.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNorwegian.java
index d5b904c5f728daaafe9af4ca2f68c09d819e37d8..5d220dfa1f04a246b15443a3e2cdf78571e20e06 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNorwegian.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNorwegian.java
@@ -58,14 +58,13 @@ public final class TestsNorwegian extends LayoutTestsBase {
// U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
// U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
.setMoreKeysOf("e",
- "3", "\u00E9", "\u00E8", "\u00EA", "\u00EB", "\u0119", "\u0117",
- "\u0113")
+ "\u00E9", "\u00E8", "\u00EA", "\u00EB", "\u0119", "\u0117", "\u0113")
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FC", "\u00FB", "\u00F9", "\u00FA", "\u016B")
+ .setMoreKeysOf("u", "\u00FC", "\u00FB", "\u00F9", "\u00FA", "\u016B")
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
// U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
@@ -74,10 +73,9 @@ public final class TestsNorwegian extends LayoutTestsBase {
// U+0153: "Å“" LATIN SMALL LIGATURE OE
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
.setMoreKeysOf("o",
- "9", "\u00F4", "\u00F2", "\u00F3", "\u00F6", "\u00F5", "\u0153",
- "\u014D")
+ "\u00F4", "\u00F2", "\u00F3", "\u00F6", "\u00F5", "\u0153", "\u014D")
// U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- .replaceKeyOfLabel(Nordic.ROW1_11, key("\u00E5"))
+ .replaceKeyOfLabel(Nordic.ROW1_11, "\u00E5")
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
.replaceKeyOfLabel(Nordic.ROW2_10, key("\u00F8", moreKey("\u00F6")))
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPolish.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPolish.java
index 7d8f62963bf13da4d206586633e7943e250a1148..04f88c3fc1016214851ec3fc86c0bd0439a79548 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPolish.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPolish.java
@@ -58,8 +58,7 @@ public final class TestsPolish extends LayoutTestsBase {
// U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
// U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
.setMoreKeysOf("e",
- "3", "\u0119", "\u00E8", "\u00E9", "\u00EA", "\u00EB", "\u0117",
- "\u0113")
+ "\u0119", "\u00E8", "\u00E9", "\u00EA", "\u00EB", "\u0117", "\u0113")
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -69,8 +68,8 @@ public final class TestsPolish extends LayoutTestsBase {
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
.setMoreKeysOf("o",
- "9", "\u00F3", "\u00F6", "\u00F4", "\u00F2", "\u00F5", "\u0153",
- "\u00F8", "\u014D")
+ "\u00F3", "\u00F6", "\u00F4", "\u00F2", "\u00F5", "\u0153", "\u00F8",
+ "\u014D")
// U+0105: "Ä…" LATIN SMALL LETTER A WITH OGONEK
// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
// U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortugueseBR.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortugueseBR.java
index 00ee6981fdf532ccb93f4d16681e7acc4664ad6a..8a984a7658efb0b59dcabfd9efce045a563450fb 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortugueseBR.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortugueseBR.java
@@ -19,9 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.LayoutCustomizer;
import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
import java.util.Locale;
@@ -31,69 +29,8 @@ import java.util.Locale;
@SmallTest
public class TestsPortugueseBR extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("pt", "BR");
- private static final LayoutBase LAYOUT = new Qwerty(new PortugueseBRCustomizer(LOCALE));
+ private static final LayoutBase LAYOUT = new Qwerty(new PortugueseCustomizer(LOCALE));
@Override
LayoutBase getLayout() { return LAYOUT; }
-
- // TODO: Make this as generic Portuguese customizer.
- static class PortugueseBRCustomizer extends LayoutCustomizer {
- public PortugueseBRCustomizer(final Locale locale) { super(locale); }
-
- @Override
- public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
- return builder
- // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
- // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
- // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
- // U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
- // U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
- // U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
- // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
- .setMoreKeysOf("e",
- "3", "\u00E9", "\u00EA", "\u00E8", "\u0119", "\u0117", "\u0113",
- "\u00EB")
- // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
- // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
- // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
- // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FA", "\u00FC", "\u00F9", "\u00FB", "\u016B")
- // U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
- // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
- // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
- // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
- // U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
- // U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- .setMoreKeysOf("i", "8", "\u00ED", "\u00EE", "\u00EC", "\u00EF", "\u012F",
- "\u012B")
- // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
- // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
- // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
- // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
- // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
- // U+0153: "Å“" LATIN SMALL LIGATURE OE
- // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
- // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
- // U+00BA: "º" MASCULINE ORDINAL INDICATOR
- .setMoreKeysOf("o",
- "9", "\u00F3", "\u00F5", "\u00F4", "\u00F2", "\u00F6", "\u0153",
- "\u00F8", "\u014D", "\u00BA")
- // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
- // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
- // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
- // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
- // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- // U+00E6: "æ" LATIN SMALL LETTER AE
- // U+00AA: "ª" FEMININE ORDINAL INDICATOR
- .setMoreKeysOf("a",
- "\u00E1", "\u00E3", "\u00E0", "\u00E2", "\u00E4", "\u00E5", "\u00E6",
- "\u00AA")
- // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
- // U+010D: "Ä" LATIN SMALL LETTER C WITH CARON
- // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
- .setMoreKeysOf("c", "\u00E7", "\u010D", "\u0107");
- }
- }
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortuguesePT.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortuguesePT.java
index 836542ea9af4eb069b1166421095d8027db858bb..e15e811db7c6601212b69f12b446a0029be1eeac 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortuguesePT.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortuguesePT.java
@@ -19,9 +19,9 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.LayoutBase.EuroCustomizer;
import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
import java.util.Locale;
@@ -36,17 +36,20 @@ public final class TestsPortuguesePT extends TestsPortugueseBR {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class PortuguesePTCustomizer extends EuroLayoutCustomizer {
- private final PortugueseBRCustomizer mPortugueseCustomizer;
+ private static class PortuguesePTCustomizer extends PortugueseCustomizer {
+ private final EuroCustomizer mEuroCustomizer;
public PortuguesePTCustomizer(final Locale locale) {
super(locale);
- mPortugueseCustomizer = new PortugueseBRCustomizer(locale);
+ mEuroCustomizer = new EuroCustomizer(locale);
}
@Override
- public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
- return mPortugueseCustomizer.setAccentedLetters(builder);
+ public ExpectedKey getCurrencyKey() { return mEuroCustomizer.getCurrencyKey(); }
+
+ @Override
+ public ExpectedKey[] getOtherCurrencyKeys() {
+ return mEuroCustomizer.getOtherCurrencyKeys();
}
}
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRomanian.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRomanian.java
index 59b328d075621e7e34ff10779a9f586a79b52020..0207f1c221403eaaa5e32dd92d57c1513e56b0e5 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRomanian.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRomanian.java
@@ -51,15 +51,14 @@ public final class TestsRomanian extends LayoutTestsBase {
public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
return builder
// U+021B: "È›" LATIN SMALL LETTER T WITH COMMA BELOW
- .setMoreKeysOf("t", "5", "\u021B")
+ .setMoreKeysOf("t", "\u021B")
// U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- .setMoreKeysOf("i", "8", "\u00EE", "\u00EF", "\u00EC", "\u00ED", "\u012F",
- "\u012B")
+ .setMoreKeysOf("i", "\u00EE", "\u00EF", "\u00EC", "\u00ED", "\u012F", "\u012B")
// U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
// U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
// U+0103: "ă" LATIN SMALL LETTER A WITH BREVE
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRussian.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRussian.java
index 14f950160c7dd217a5c6f94788859d6b2df60c78..9919207edeff69bea690a57dd6e44e567e222519 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRussian.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRussian.java
@@ -52,15 +52,15 @@ public final class TestsRussian extends LayoutTestsBase {
return builder
// U+0435: "е" CYRILLIC SMALL LETTER IE
// U+0451: "Ñ‘" CYRILLIC SMALL LETTER IO
- .setMoreKeysOf("\u0435", "5", "\u0451")
+ .setMoreKeysOf("\u0435", "\u0451")
// U+0449: "щ" CYRILLIC SMALL LETTER SHCHA
- .replaceKeyOfLabel(EastSlavic.ROW1_9, key("\u0449", moreKey("9")))
+ .replaceKeyOfLabel(EastSlavic.ROW1_9, key("\u0449", additionalMoreKey("9")))
// U+044B: "Ñ‹" CYRILLIC SMALL LETTER YERU
- .replaceKeyOfLabel(EastSlavic.ROW2_2, key("\u044B"))
+ .replaceKeyOfLabel(EastSlavic.ROW2_2, "\u044B")
// U+044D: "Ñ" CYRILLIC SMALL LETTER E
- .replaceKeyOfLabel(EastSlavic.ROW2_11, key("\u044D"))
+ .replaceKeyOfLabel(EastSlavic.ROW2_11, "\u044D")
// U+0438: "и" CYRILLIC SMALL LETTER I
- .replaceKeyOfLabel(EastSlavic.ROW3_5, key("\u0438"))
+ .replaceKeyOfLabel(EastSlavic.ROW3_5, "\u0438")
// U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN
// U+044A: "ÑŠ" CYRILLIC SMALL LETTER HARD SIGN
.setMoreKeysOf("\u044C", "\u044A");
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbian.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbian.java
index 119ea142c774f5898671f6bddf91a11afaade935..41f1690f3a967829df5af902c72c0dbbcb07c603 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbian.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbian.java
@@ -58,18 +58,18 @@ public final class TestsSerbian extends LayoutTestsBase {
return builder
// U+0435: "е" CYRILLIC SMALL LETTER IE
// U+0450: "Ñ" CYRILLIC SMALL LETTER IE WITH GRAVE
- .setMoreKeysOf("\u0435", "3", "\u0450")
+ .setMoreKeysOf("\u0435", "\u0450")
// U+0437: "з" CYRILLIC SMALL LETTER ZE
- .replaceKeyOfLabel(SouthSlavic.ROW1_6, key("\u0437", moreKey("6")))
+ .replaceKeyOfLabel(SouthSlavic.ROW1_6, key("\u0437", additionalMoreKey("6")))
// U+0438: "и" CYRILLIC SMALL LETTER I
// U+045D: "Ñ" CYRILLIC SMALL LETTER I WITH GRAVE
- .setMoreKeysOf("\u0438", "8", "\u045D")
+ .setMoreKeysOf("\u0438", "\u045D")
// U+045B: "Ñ›" CYRILLIC SMALL LETTER TSHE
- .replaceKeyOfLabel(SouthSlavic.ROW2_11, key("\u045B"))
+ .replaceKeyOfLabel(SouthSlavic.ROW2_11, "\u045B")
// U+0455: "Ñ•" CYRILLIC SMALL LETTER DZE
- .replaceKeyOfLabel(SouthSlavic.ROW3_1, key("\u0455"))
+ .replaceKeyOfLabel(SouthSlavic.ROW3_1, "\u0455")
// U+0452: "Ñ’" CYRILLIC SMALL LETTER DJE
- .replaceKeyOfLabel(SouthSlavic.ROW3_8, key("\u0452"));
+ .replaceKeyOfLabel(SouthSlavic.ROW3_8, "\u0452");
}
}
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovak.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovak.java
index 3d7825b13acc559fff9be4305a059ddbac91f5d2..bdaf0cad1d45c9548873a7eee7121b769663e4e6 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovak.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovak.java
@@ -19,7 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.LayoutBase.EuroCustomizer;
import com.android.inputmethod.keyboard.layout.Qwerty;
import com.android.inputmethod.keyboard.layout.Symbols;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
@@ -38,7 +38,7 @@ public final class TestsSlovak extends LayoutTestsBase {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class SlovakCustomizer extends EuroLayoutCustomizer {
+ private static class SlovakCustomizer extends EuroCustomizer {
public SlovakCustomizer(final Locale locale) { super(locale); }
@Override
@@ -65,18 +65,18 @@ public final class TestsSlovak extends LayoutTestsBase {
// U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
// U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
.setMoreKeysOf("e",
- "3", "\u00E9", "\u011B", "\u0113", "\u0117", "\u00E8", "\u00EA",
- "\u00EB", "\u0119")
+ "\u00E9", "\u011B", "\u0113", "\u0117", "\u00E8", "\u00EA", "\u00EB",
+ "\u0119")
// U+0155: "Å•" LATIN SMALL LETTER R WITH ACUTE
// U+0159: "Å™" LATIN SMALL LETTER R WITH CARON
// U+0157: "Å—" LATIN SMALL LETTER R WITH CEDILLA
- .setMoreKeysOf("r", "4", "\u0155", "\u0159", "\u0157")
+ .setMoreKeysOf("r", "\u0155", "\u0159", "\u0157")
// U+0165: "Å¥" LATIN SMALL LETTER T WITH CARON
// U+0163: "Å£" LATIN SMALL LETTER T WITH CEDILLA
- .setMoreKeysOf("t", "5", "\u0165", "\u0163")
+ .setMoreKeysOf("t", "\u0165", "\u0163")
// U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
// U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
- .setMoreKeysOf("y", "6", "\u00FD", "\u00FF")
+ .setMoreKeysOf("y", "\u00FD", "\u00FF")
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
@@ -86,8 +86,8 @@ public final class TestsSlovak extends LayoutTestsBase {
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
// U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
.setMoreKeysOf("u",
- "7", "\u00FA", "\u016F", "\u00FC", "\u016B", "\u0173", "\u00F9",
- "\u00FB", "\u0171")
+ "\u00FA", "\u016F", "\u00FC", "\u016B", "\u0173", "\u00F9", "\u00FB",
+ "\u0171")
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
// U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
@@ -96,8 +96,7 @@ public final class TestsSlovak extends LayoutTestsBase {
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
// U+0131: "ı" LATIN SMALL LETTER DOTLESS I
.setMoreKeysOf("i",
- "8", "\u00ED", "\u012B", "\u012F", "\u00EC", "\u00EE", "\u00EF",
- "\u0131")
+ "\u00ED", "\u012B", "\u012F", "\u00EC", "\u00EE", "\u00EF", "\u0131")
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
@@ -107,8 +106,8 @@ public final class TestsSlovak extends LayoutTestsBase {
// U+0151: "Å‘" LATIN SMALL LETTER O WITH DOUBLE ACUTE
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
.setMoreKeysOf("o",
- "9", "\u00F4", "\u00F3", "\u00F6", "\u00F2", "\u00F5", "\u0153",
- "\u0151", "\u00F8")
+ "\u00F4", "\u00F3", "\u00F6", "\u00F2", "\u00F5", "\u0153", "\u0151",
+ "\u00F8")
// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
// U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovenian.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovenian.java
index 88a23ba07fad18e54a57170c2a08346991e022c9..cdb1beeba56d333ae28a10b8379e772b4b45d61d 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovenian.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovenian.java
@@ -19,7 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.LayoutBase.EuroCustomizer;
import com.android.inputmethod.keyboard.layout.Qwerty;
import com.android.inputmethod.keyboard.layout.Symbols;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
@@ -38,7 +38,7 @@ public final class TestsSlovenian extends LayoutTestsBase {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class SlovenianCustomizer extends EuroLayoutCustomizer {
+ private static class SlovenianCustomizer extends EuroCustomizer {
public SlovenianCustomizer(final Locale locale) { super(locale); }
@Override
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanish.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanish.java
index cc5a64c69d667192a607bf677aacae90e2c4228a..12e8676aeff784dfa2517005c6d2926324a97f05 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanish.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanish.java
@@ -19,11 +19,9 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.LayoutBase.EuroCustomizer;
import com.android.inputmethod.keyboard.layout.Spanish;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.keyboard.layout.tests.TestsSpanishUS.SpanishUSCustomizer;
import java.util.Locale;
@@ -38,22 +36,20 @@ public class TestsSpanish extends LayoutTestsBase {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class SpanishESCustomizer extends EuroLayoutCustomizer {
- private final SpanishUSCustomizer mSpanishUSCustomizer;
+ private static class SpanishESCustomizer extends SpanishCustomizer {
+ private final EuroCustomizer mEuroCustomizer;
public SpanishESCustomizer(final Locale locale) {
super(locale);
- mSpanishUSCustomizer = new SpanishUSCustomizer(locale);
+ mEuroCustomizer = new EuroCustomizer(locale);
}
@Override
- public ExpectedKey[] getPunctuationMoreKeys(final boolean isPhone) {
- return mSpanishUSCustomizer.getPunctuationMoreKeys(isPhone);
- }
+ public ExpectedKey getCurrencyKey() { return mEuroCustomizer.getCurrencyKey(); }
@Override
- public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
- return mSpanishUSCustomizer.setAccentedLetters(builder);
+ public ExpectedKey[] getOtherCurrencyKeys() {
+ return mEuroCustomizer.getOtherCurrencyKeys();
}
}
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanishUS.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanishUS.java
index 517db9d9f90b39c024489d97a0cb907058d6ccfb..c3ac0a0c0a2391eb2a509235fff50b313459a289 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanishUS.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanishUS.java
@@ -19,10 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.LayoutCustomizer;
import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
import java.util.Locale;
@@ -32,89 +29,8 @@ import java.util.Locale;
@SmallTest
public class TestsSpanishUS extends TestsSpanish {
private static final Locale LOCALE = new Locale("es", "US");
- private static final LayoutBase LAYOUT = new Spanish(new SpanishUSCustomizer(LOCALE));
+ private static final LayoutBase LAYOUT = new Spanish(new SpanishCustomizer(LOCALE));
@Override
LayoutBase getLayout() { return LAYOUT; }
-
- // Make this as generic Spanish customizer.
- static class SpanishUSCustomizer extends LayoutCustomizer {
- public SpanishUSCustomizer(final Locale locale) { super(locale); }
-
- @Override
- public ExpectedKey[] getPunctuationMoreKeys(final boolean isPhone) {
- return isPhone ? PHONE_PUNCTUATION_MORE_KEYS
- : LayoutBase.TABLET_PUNCTUATION_MORE_KEYS;
- }
-
- // Punctuation more keys for phone form factor.
- private static final ExpectedKey[] PHONE_PUNCTUATION_MORE_KEYS = joinKeys(
- // U+00A1: "¡" INVERTED EXCLAMATION MARK
- // U+00BF: "¿" INVERTED QUESTION MARK
- "\u00A1", ";", "/", "(", ")", "#", "!", ",", "?",
- "\u00BF", "&", "%", "+", "\"", "-", ":", "'", "@");
-
- @Override
- public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
- return builder
- // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
- // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
- // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
- // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
- // U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
- // U+0117: "Ä—" LATIN SMALL LETTER E WITH DOT ABOVE
- // U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
- .setMoreKeysOf("e",
- "3", "\u00E9", "\u00E8", "\u00EB", "\u00EA", "\u0119", "\u0117",
- "\u0113")
- // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
- // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
- // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
- // U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FA", "\u00FC", "\u00F9", "\u00FB", "\u016B")
- // U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
- // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
- // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
- // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
- // U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
- // U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- .setMoreKeysOf("i", "8", "\u00ED", "\u00EF", "\u00EC", "\u00EE", "\u012F",
- "\u012B")
- // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
- // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
- // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
- // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
- // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
- // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
- // U+0153: "Å“" LATIN SMALL LIGATURE OE
- // U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
- // U+00BA: "º" MASCULINE ORDINAL INDICATOR
- .setMoreKeysOf("o",
- "9", "\u00F3", "\u00F2", "\u00F6", "\u00F4", "\u00F5", "\u00F8",
- "\u0153", "\u014D", "\u00BA")
- // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
- // U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
- // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
- // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
- // U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- // U+0105: "Ä…" LATIN SMALL LETTER A WITH OGONEK
- // U+00E6: "æ" LATIN SMALL LETTER AE
- // U+0101: "Ä" LATIN SMALL LETTER A WITH MACRON
- // U+00AA: "ª" FEMININE ORDINAL INDICATOR
- .setMoreKeysOf("a",
- "\u00E1", "\u00E0", "\u00E4", "\u00E2", "\u00E3", "\u00E5", "\u0105",
- "\u00E6", "\u0101", "\u00AA")
- // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
- .replaceKeyOfLabel(Spanish.ROW2_10, key("\u00F1"))
- // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
- // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
- // U+010D: "Ä" LATIN SMALL LETTER C WITH CARON
- .setMoreKeysOf("c", "\u00E7", "\u0107", "\u010D")
- // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
- // U+0144: "Å„" LATIN SMALL LETTER N WITH ACUTE
- .setMoreKeysOf("n", "\u00F1", "\u0144");
- }
- }
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwahili.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwahili.java
index 49e1912ee4b4d0ff197439cd482114e3ef7638e4..13b974194861b41893ca1d17737d6aa6673aec15 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwahili.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwahili.java
@@ -47,19 +47,19 @@ public final class TestsSwahili extends LayoutTestsBase {
// U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
// U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
// U+0113: "Ä“" LATIN SMALL LETTER E WITH MACRON
- .setMoreKeysOf("e", "3", "\u00E8", "\u00E9", "\u00EA", "\u00EB", "\u0113")
+ .setMoreKeysOf("e", "\u00E8", "\u00E9", "\u00EA", "\u00EB", "\u0113")
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FB", "\u00FC", "\u00F9", "\u00FA", "\u016B")
+ .setMoreKeysOf("u", "\u00FB", "\u00FC", "\u00F9", "\u00FA", "\u016B")
// U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
- .setMoreKeysOf("i", "8", "\u00EE", "\u00EF", "\u00ED", "\u012B", "\u00EC")
+ .setMoreKeysOf("i", "\u00EE", "\u00EF", "\u00ED", "\u012B", "\u00EC")
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
@@ -69,8 +69,8 @@ public final class TestsSwahili extends LayoutTestsBase {
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
// U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
.setMoreKeysOf("o",
- "9", "\u00F4", "\u00F6", "\u00F2", "\u00F3", "\u0153", "\u00F8",
- "\u014D", "\u00F5")
+ "\u00F4", "\u00F6", "\u00F2", "\u00F3", "\u0153", "\u00F8", "\u014D",
+ "\u00F5")
// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
// U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwedish.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwedish.java
index 14155cb0e4d9d31f8e25a5fe2d05af71b3ee31e5..9b58914a2367481fe1e2bf103b06b1d9cbc39a24 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwedish.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwedish.java
@@ -19,7 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.LayoutBase.EuroCustomizer;
import com.android.inputmethod.keyboard.layout.Nordic;
import com.android.inputmethod.keyboard.layout.Symbols;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
@@ -38,7 +38,7 @@ public final class TestsSwedish extends LayoutTestsBase {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class SwedishCustomizer extends EuroLayoutCustomizer {
+ private static class SwedishCustomizer extends EuroCustomizer {
public SwedishCustomizer(final Locale locale) { super(locale); }
@Override
@@ -55,39 +55,39 @@ public final class TestsSwedish extends LayoutTestsBase {
// U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
// U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
// U+0119: "Ä™" LATIN SMALL LETTER E WITH OGONEK
- .setMoreKeysOf("e", "3", "\u00E9", "\u00E8", "\u00EA", "\u00EB", "\u0119")
+ .setMoreKeysOf("e", "\u00E9", "\u00E8", "\u00EA", "\u00EB", "\u0119")
// U+0159: "Å™" LATIN SMALL LETTER R WITH CARON
- .setMoreKeysOf("r", "4", "\u0159")
+ .setMoreKeysOf("r", "\u0159")
// U+0165: "Å¥" LATIN SMALL LETTER T WITH CARON
// U+00FE: "þ" LATIN SMALL LETTER THORN
- .setMoreKeysOf("t", "5", "\u0165", "\u00FE")
+ .setMoreKeysOf("t", "\u0165", "\u00FE")
// U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
// U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
- .setMoreKeysOf("y", "6", "\u00FD", "\u00FF")
+ .setMoreKeysOf("y", "\u00FD", "\u00FF")
// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FC", "\u00FA", "\u00F9", "\u00FB", "\u016B")
+ .setMoreKeysOf("u", "\u00FC", "\u00FA", "\u00F9", "\u00FB", "\u016B")
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
// U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
- .setMoreKeysOf("i", "8", "\u00ED", "\u00EC", "\u00EE", "\u00EF")
+ .setMoreKeysOf("i", "\u00ED", "\u00EC", "\u00EE", "\u00EF")
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
// U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
- .setMoreKeysOf("o", "9", "\u00F3", "\u00F2", "\u00F4", "\u00F5", "\u014D")
+ .setMoreKeysOf("o", "\u00F3", "\u00F2", "\u00F4", "\u00F5", "\u014D")
// U+00E5: "Ã¥" LATIN SMALL LETTER A WITH RING ABOVE
- .replaceKeyOfLabel(Nordic.ROW1_11, key("\u00E5"))
+ .replaceKeyOfLabel(Nordic.ROW1_11, "\u00E5")
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
// U+0153: "Å“" LATIN SMALL LIGATURE OE
- .replaceKeyOfLabel(Nordic.ROW2_10, key("\u00F6",
- moreKey("\u00F8"), moreKey("\u0153")))
+ .replaceKeyOfLabel(Nordic.ROW2_10,
+ key("\u00F6", joinMoreKeys("\u00F8", "\u0153")))
// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
// U+00E6: "æ" LATIN SMALL LETTER AE
.replaceKeyOfLabel(Nordic.ROW2_11, key("\u00E4", moreKey("\u00E6")))
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTagalog.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTagalog.java
index 72e435a24be523e9b56d19665cdb946fde6aee44..38d5364e5871b0f6cbbde9f0142c7fab160e10d1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTagalog.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTagalog.java
@@ -19,10 +19,8 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.LayoutCustomizer;
import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.keyboard.layout.tests.TestsSpanishUS.SpanishUSCustomizer;
+import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
import java.util.Locale;
@@ -37,17 +35,16 @@ public class TestsTagalog extends TestsSpanish {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class TagalogCustomizer extends LayoutCustomizer {
- private final SpanishUSCustomizer mSpanishUSCustomizer;
+ private static class TagalogCustomizer extends SpanishCustomizer {
public TagalogCustomizer(final Locale locale) {
super(locale);
- mSpanishUSCustomizer = new SpanishUSCustomizer(locale);
}
@Override
- public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {
- return mSpanishUSCustomizer.setAccentedLetters(builder);
+ public ExpectedKey[] getPunctuationMoreKeys(final boolean isPhone) {
+ return isPhone ? LayoutBase.PHONE_PUNCTUATION_MORE_KEYS
+ : LayoutBase.TABLET_PUNCTUATION_MORE_KEYS;
}
}
}
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTurkish.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTurkish.java
index ab67ae90d845bc97f08ef1df6ddaf514e73a2e29..b35f8850a49747687453043860e7c278b55e1e51 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTurkish.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTurkish.java
@@ -19,7 +19,7 @@ package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.LayoutBase.EuroLayoutCustomizer;
+import com.android.inputmethod.keyboard.layout.LayoutBase.EuroCustomizer;
import com.android.inputmethod.keyboard.layout.Qwerty;
import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
@@ -36,7 +36,7 @@ public final class TestsTurkish extends LayoutTestsBase {
@Override
LayoutBase getLayout() { return LAYOUT; }
- private static class TurkishCustomizer extends EuroLayoutCustomizer {
+ private static class TurkishCustomizer extends EuroCustomizer {
public TurkishCustomizer(final Locale locale) { super(locale); }
@Override
@@ -47,7 +47,7 @@ public final class TestsTurkish extends LayoutTestsBase {
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+016B: "Å«" LATIN SMALL LETTER U WITH MACRON
- .setMoreKeysOf("u", "7", "\u00FC", "\u00FB", "\u00F9", "\u00FA", "\u016B")
+ .setMoreKeysOf("u", "\u00FC", "\u00FB", "\u00F9", "\u00FA", "\u016B")
// U+0131: "ı" LATIN SMALL LETTER DOTLESS I
// U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
@@ -55,7 +55,7 @@ public final class TestsTurkish extends LayoutTestsBase {
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
// U+012B: "Ä«" LATIN SMALL LETTER I WITH MACRON
- .setMoreKeysOf("i", "8",
+ .setMoreKeysOf("i",
"\u0131", "\u00EE", "\u00EF", "\u00EC", "\u00ED", "\u012F", "\u012B")
// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -66,8 +66,8 @@ public final class TestsTurkish extends LayoutTestsBase {
// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
// U+014D: "Å" LATIN SMALL LETTER O WITH MACRON
.setMoreKeysOf("o",
- "9", "\u00F6", "\u00F4", "\u0153", "\u00F2", "\u00F3", "\u00F5",
- "\u00F8", "\u014D")
+ "\u00F6", "\u00F4", "\u0153", "\u00F2", "\u00F3", "\u00F5", "\u00F8",
+ "\u014D")
// U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
.setMoreKeysOf("a", "\u00E2")
// U+015F: "ÅŸ" LATIN SMALL LETTER S WITH CEDILLA
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUkrainian.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUkrainian.java
index 27893fe9b5b74a872c45e813ab766ee113c6120a..a6bcacc9e00a3df7a0faadd9ac880e0cfcbfb4eb 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUkrainian.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUkrainian.java
@@ -65,16 +65,16 @@ public final class TestsUkrainian extends LayoutTestsBase {
return builder
// U+0433: "г" CYRILLIC SMALL LETTER GHE
// U+0491: "Ò‘" CYRILLIC SMALL LETTER GHE WITH UPTURN
- .setMoreKeysOf("\u0433", "7", "\u0491")
+ .setMoreKeysOf("\u0433", "\u0491")
// U+0449: "щ" CYRILLIC SMALL LETTER SHCHA
- .replaceKeyOfLabel(EastSlavic.ROW1_9, key("\u0449", moreKey("9")))
+ .replaceKeyOfLabel(EastSlavic.ROW1_9, key("\u0449", additionalMoreKey("9")))
// U+0456: "Ñ–" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
// U+0457: "Ñ—" CYRILLIC SMALL LETTER YI
.replaceKeyOfLabel(EastSlavic.ROW2_2, key("\u0456", moreKey("\u0457")))
// U+0454: "Ñ”" CYRILLIC SMALL LETTER UKRAINIAN IE
- .replaceKeyOfLabel(EastSlavic.ROW2_11, key("\u0454"))
+ .replaceKeyOfLabel(EastSlavic.ROW2_11, "\u0454")
// U+0438: "и" CYRILLIC SMALL LETTER I
- .replaceKeyOfLabel(EastSlavic.ROW3_5, key("\u0438"))
+ .replaceKeyOfLabel(EastSlavic.ROW3_5, "\u0438")
// U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN
// U+044A: "ÑŠ" CYRILLIC SMALL LETTER HARD SIGN
.setMoreKeysOf("\u044C", "\u044A");
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsVietnamese.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsVietnamese.java
index 96ae38a9ce20890fae0a117069bbcc86e1969fb3..83d86ac4d9bbb49318dcb2988ab216405dba12f3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsVietnamese.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsVietnamese.java
@@ -71,14 +71,14 @@ public final class TestsVietnamese extends LayoutTestsBase {
// U+1EC5: "á»…" LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
// U+1EC7: "ệ" LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
.setMoreKeysOf("e",
- "3", "\u00E8", "\u00E9", "\u1EBB", "\u1EBD", "\u1EB9", "\u00EA",
- "\u1EC1", "\u1EBF", "\u1EC3", "\u1EC5", "\u1EC7")
+ "\u00E8", "\u00E9", "\u1EBB", "\u1EBD", "\u1EB9", "\u00EA", "\u1EC1",
+ "\u1EBF", "\u1EC3", "\u1EC5", "\u1EC7")
// U+1EF3: "ỳ" LATIN SMALL LETTER Y WITH GRAVE
// U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
// U+1EF7: "á»·" LATIN SMALL LETTER Y WITH HOOK ABOVE
// U+1EF9: "ỹ" LATIN SMALL LETTER Y WITH TILDE
// U+1EF5: "ỵ" LATIN SMALL LETTER Y WITH DOT BELOW
- .setMoreKeysOf("y", "6", "\u1EF3", "\u00FD", "\u1EF7", "\u1EF9", "\u1EF5")
+ .setMoreKeysOf("y", "\u1EF3", "\u00FD", "\u1EF7", "\u1EF9", "\u1EF5")
// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
// U+1EE7: "ủ" LATIN SMALL LETTER U WITH HOOK ABOVE
@@ -91,14 +91,14 @@ public final class TestsVietnamese extends LayoutTestsBase {
// U+1EEF: "ữ" LATIN SMALL LETTER U WITH HORN AND TILDE
// U+1EF1: "á»±" LATIN SMALL LETTER U WITH HORN AND DOT BELOW
.setMoreKeysOf("u",
- "7", "\u00F9", "\u00FA", "\u1EE7", "\u0169", "\u1EE5", "\u01B0",
- "\u1EEB", "\u1EE9", "\u1EED", "\u1EEF", "\u1EF1")
+ "\u00F9", "\u00FA", "\u1EE7", "\u0169", "\u1EE5", "\u01B0", "\u1EEB",
+ "\u1EE9", "\u1EED", "\u1EEF", "\u1EF1")
// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
// U+00ED: "Ã" LATIN SMALL LETTER I WITH ACUTE
// U+1EC9: "ỉ" LATIN SMALL LETTER I WITH HOOK ABOVE
// U+0129: "Ä©" LATIN SMALL LETTER I WITH TILDE
// U+1ECB: "ị" LATIN SMALL LETTER I WITH DOT BELOW
- .setMoreKeysOf("i", "8", "\u00EC", "\u00ED", "\u1EC9", "\u0129", "\u1ECB")
+ .setMoreKeysOf("i", "\u00EC", "\u00ED", "\u1EC9", "\u0129", "\u1ECB")
// U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
// U+1ECF: "á»" LATIN SMALL LETTER O WITH HOOK ABOVE
@@ -117,9 +117,9 @@ public final class TestsVietnamese extends LayoutTestsBase {
// U+1EE1: "ỡ" LATIN SMALL LETTER O WITH HORN AND TILDE
// U+1EE3: "ợ" LATIN SMALL LETTER O WITH HORN AND DOT BELOW
.setMoreKeysOf("o",
- "9", "\u00F2", "\u00F3", "\u1ECF", "\u00F5", "\u1ECD", "\u00F4",
- "\u1ED3", "\u1ED1", "\u1ED5", "\u1ED7", "\u1ED9", "\u01A1", "\u1EDD",
- "\u1EDB", "\u1EDF", "\u1EE1", "\u1EE3")
+ "\u00F2", "\u00F3", "\u1ECF", "\u00F5", "\u1ECD", "\u00F4", "\u1ED3",
+ "\u1ED1", "\u1ED5", "\u1ED7", "\u1ED9", "\u01A1", "\u1EDD", "\u1EDB",
+ "\u1EDF", "\u1EE1", "\u1EE3")
// U+00E0: "Ã " LATIN SMALL LETTER A WITH GRAVE
// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
// U+1EA3: "ả" LATIN SMALL LETTER A WITH HOOK ABOVE
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsZulu.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsZulu.java
index 04e89be554a6733e773f67f388eeff15caf5b709..e048e92c200e9a2752fdd56e1fe9e0349c45e98c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsZulu.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsZulu.java
@@ -29,7 +29,7 @@ import java.util.Locale;
@SmallTest
public final class TestsZulu extends TestsEnglishUS {
private static final Locale LOCALE = new Locale("zu");
- private static final LayoutBase LAYOUT = new Qwerty(new EnglishUSCustomizer(LOCALE));
+ private static final LayoutBase LAYOUT = new Qwerty(new EnglishCustomizer(LOCALE));
@Override
LayoutBase getLayout() { return LAYOUT; }