Update Bengali keyboard to add a few vowel signs
Bug: 10028755
Change-Id: Ia0b8624470c5b0667a3d7267d3cf8d4c937b0b0c
diff --git a/java/res/xml/rowkeys_bengali1.xml b/java/res/xml/rowkeys_bengali1.xml
index c1fd8b4..971fff6 100644
--- a/java/res/xml/rowkeys_bengali1.xml
+++ b/java/res/xml/rowkeys_bengali1.xml
@@ -20,35 +20,40 @@
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
<!-- U+0994: "ঔ" BENGALI LETTER AU
+ U+09CC: "ৌ" BENGALI VOWEL SIGN AU
U+09E7: "১" BENGALI DIGIT ONE -->
<Key
latin:keySpec="ঔ"
latin:keyHintLabel="১"
- latin:additionalMoreKeys="১,1" />
+ latin:additionalMoreKeys="ৌ,১,1" />
<!-- U+0990: "ঐ" BENGALI LETTER AI
+ U+09C8: "ৈ" BENGALI VOWEL SIGN AI
U+09E8: "২" BENGALI DIGIT TWO -->
<Key
latin:keySpec="ঐ"
latin:keyHintLabel="২"
- latin:additionalMoreKeys="২,2" />
+ latin:additionalMoreKeys="ৈ,২,2" />
<!-- U+0986: "আ" BENGALI LETTER AA
+ U+09BE: "া" BENGALI VOWEL SIGN AA
U+09E9: "৩" BENGALI DIGIT THREE -->
<Key
latin:keySpec="আ"
latin:keyHintLabel="৩"
- latin:additionalMoreKeys="৩,3" />
+ latin:additionalMoreKeys="া,৩,3" />
<!-- U+0988: "ঈ" BENGALI LETTER II
+ U+09C0: "ী" BENGALI VOWEL SIGN II
U+09EA: "৪" BENGALI DIGIT FOUR -->
<Key
latin:keySpec="ঈ"
latin:keyHintLabel="৪"
- latin:additionalMoreKeys="৪,4" />
+ latin:additionalMoreKeys="ী,৪,4" />
<!-- U+098A: "ঊ" BENGALI LETTER UU
+ U+09C2: "ূ" BENGALI VOWEL SIGN UU
U+09EB: "৫" BENGALI DIGIT FIVE -->
<Key
latin:keySpec="ঊ"
latin:keyHintLabel="৫"
- latin:additionalMoreKeys="৫,5" />
+ latin:additionalMoreKeys="ূ,৫,5" />
<!-- U+09AC: "ব" BENGALI LETTER BA
U+09AD: "ভ" BENGALI LETTER BHA
U+09EC: "৬" BENGALI DIGIT SIX -->
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Bengali.java b/tests/src/com/android/inputmethod/keyboard/layout/Bengali.java
index 79c7d08..2101ddf 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Bengali.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Bengali.java
@@ -72,20 +72,25 @@
private static final ExpectedKey[][] ALPHABET_COMMON = new ExpectedKeyboardBuilder()
.setKeysOfRow(1,
// U+0994: "ঔ" BENGALI LETTER AU
+ // U+09CC: "ৌ" BENGALI VOWEL SIGN AU
// U+09E7: "১" BENGALI DIGIT ONE
- key("\u0994", joinMoreKeys("\u09E7", "1")),
+ key("\u0994", joinMoreKeys("\u09CC", "\u09E7", "1")),
// U+0990: "ঐ" BENGALI LETTER AI
+ // U+09C8: "ৈ" BENGALI VOWEL SIGN AI
// U+09E8: "২" BENGALI DIGIT TWO
- key("\u0990", joinMoreKeys("\u09E8", "2")),
+ key("\u0990", joinMoreKeys("\u09C8", "\u09E8", "2")),
// U+0986: "আ" BENGALI LETTER AA
+ // U+09BE: "া" BENGALI VOWEL SIGN AA
// U+09E9: "৩" BENGALI DIGIT THREE
- key("\u0986", joinMoreKeys("\u09E9", "3")),
+ key("\u0986", joinMoreKeys("\u09BE", "\u09E9", "3")),
// U+0988: "ঈ" BENGALI LETTER II
+ // U+09C0: "ী" BENGALI VOWEL SIGN II
// U+09EA: "৪" BENGALI DIGIT FOUR
- key("\u0988", joinMoreKeys("\u09EA", "4")),
+ key("\u0988", joinMoreKeys("\u09C0", "\u09EA", "4")),
// U+098A: "ঊ" BENGALI LETTER UU
+ // U+09C2: "ূ" BENGALI VOWEL SIGN UU
// U+09EB: "৫" BENGALI DIGIT FIVE
- key("\u098A", joinMoreKeys("\u09EB", "5")),
+ key("\u098A", joinMoreKeys("\u09C2", "\u09EB", "5")),
// U+09AC: "ব" BENGALI LETTER BA
// U+09AD: "ভ" BENGALI LETTER BHA
// U+09EC: "৬" BENGALI DIGIT SIX