commit 074e9812eea43bfa562d5bac8b5611ccf403000f
author Tadashi G. Takaoka <takaoka@google.com> Tue Jul 08 10:06:10 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 02 19:52:36 2014 +0000
tree 34016a6194d3af8eb59171a5c5b08d6a2936346b
parent 63ccbf1cf4bdad3f788617a5e5f8c7871cbdd4b3
parent b5696b4f670b5a240534bc81b106de78aba653d9

Merge "Add Tamil keyboard"

java/res/xml/rowkeys_bengali1.xml

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="&#x0994;"
         latin:keyHintLabel="&#x09E7;"
-        latin:additionalMoreKeys="&#x09E7;,1" />
+        latin:additionalMoreKeys="&#x09CC;,&#x09E7;,1" />
     <!-- U+0990: "ঐ" BENGALI LETTER AI
+         U+09C8: "ৈ" BENGALI VOWEL SIGN AI
          U+09E8: "২" BENGALI DIGIT TWO -->
     <Key
         latin:keySpec="&#x0990;"
         latin:keyHintLabel="&#x09E8;"
-        latin:additionalMoreKeys="&#x09E8;,2" />
+        latin:additionalMoreKeys="&#x09C8;,&#x09E8;,2" />
     <!-- U+0986: "আ" BENGALI LETTER AA
+         U+09BE: "া" BENGALI VOWEL SIGN AA
          U+09E9: "৩" BENGALI DIGIT THREE -->
     <Key
         latin:keySpec="&#x0986;"
         latin:keyHintLabel="&#x09E9;"
-        latin:additionalMoreKeys="&#x09E9;,3" />
+        latin:additionalMoreKeys="&#x09BE;,&#x09E9;,3" />
     <!-- U+0988: "ঈ" BENGALI LETTER II
+         U+09C0: "ী" BENGALI VOWEL SIGN II
          U+09EA: "৪" BENGALI DIGIT FOUR -->
     <Key
         latin:keySpec="&#x0988;"
         latin:keyHintLabel="&#x09EA;"
-        latin:additionalMoreKeys="&#x09EA;,4" />
+        latin:additionalMoreKeys="&#x09C0;,&#x09EA;,4" />
     <!-- U+098A: "ঊ" BENGALI LETTER UU
+         U+09C2: "ূ" BENGALI VOWEL SIGN UU
          U+09EB: "৫" BENGALI DIGIT FIVE -->
     <Key
         latin:keySpec="&#x098A;"
         latin:keyHintLabel="&#x09EB;"
-        latin:additionalMoreKeys="&#x09EB;,5" />
+        latin:additionalMoreKeys="&#x09C2;,&#x09EB;,5" />
     <!-- U+09AC: "ব" BENGALI LETTER BA
          U+09AD: "ভ" BENGALI LETTER BHA
          U+09EC: "৬" BENGALI DIGIT SIX -->

java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java

diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
index 2d063fd..8b8a9dd 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
@@ -753,8 +753,8 @@
         /* double_quotes */ "!text/double_9qm_lqm",
     };
 
-    /* Locale bn: Bengali */
-    private static final String[] TEXTS_bn = {
+    /* Locale bn_IN: Bengali (India) */
+    private static final String[] TEXTS_bn_IN = {
         /* morekeys_a ~ */
         null, null, null, null, null,
         /* ~ morekeys_i */
@@ -3841,7 +3841,7 @@
         "az_AZ"  , TEXTS_az_AZ, /*   8/ 18 Azerbaijani (Azerbaijan) */
         "be_BY"  , TEXTS_be_BY, /*   9/ 32 Belarusian (Belarus) */
         "bg"     , TEXTS_bg,    /*   2/  8 Bulgarian */
-        "bn"     , TEXTS_bn,    /*   2/ 15 Bengali */
+        "bn_IN"  , TEXTS_bn_IN, /*   2/ 15 Bengali (India) */
         "ca"     , TEXTS_ca,    /*  11/ 96 Catalan */
         "cs"     , TEXTS_cs,    /*  17/ 21 Czech */
         "da"     , TEXTS_da,    /*  19/ 54 Danish */

tests/src/com/android/inputmethod/keyboard/layout/Bengali.java

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

tools/make-keyboard-text/res/values-bn-rIN/donottranslate-more-keys.xml

diff --git a/tools/make-keyboard-text/res/values-bn/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-bn-rIN/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-bn/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-bn-rIN/donottranslate-more-keys.xml