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

am f9a4b20c: Merge "Fix missing Telugu letters" 

* commit 'f9a4b20c9660aff868f76d56504d0ff5631aae42':
  Fix missing Telugu letters
main
Tadashi G. Takaoka 2014-10-17 17:03:48 +00:00 committed by Android Git Automerger
parent 0f5566e6c7 f9a4b20c96
commit 58fab48bbc
3 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/res/xml/rowkeys_telugu2.xml
View File

@ -51,10 +51,10 @@
latin:moreKeys="ఫ" />
<!-- U+0C30: "ర" TELUGU LETTER RA
U+0C31: "ఱ" TELUGU LETTER RRA
U+0C43: "ృ" TELUGU VOWEL SIGN VOCALIC R -->
U+0C4D/U+0C30: "్ర" TELUGU SIGN VIRAMA/TELUGU LETTER RA -->
<Key
latin:keySpec="&#x0C30;"
latin:moreKeys="&#x0C31;,&#x0C43;" />
latin:moreKeys="&#x0C31;,&#x0C4D;&#x0C30;" />
<!-- U+0C15: "క" TELUGU LETTER KA
U+0C16: "ఖ" TELUGU LETTER KHA -->
<Key

24
java/res/xml/rowkeys_telugu3.xml
View File

@ -19,24 +19,28 @@
-->
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
<!-- U+0C46: "ె" TELUGU VOWEL SIGN E
<!-- U+0C4A: "ొ" TELUGU VOWEL SIGN O
U+0C12: "ఒ" TELUGU LETTER O -->
<Key
latin:keySpec="&#x0C46;"
latin:keySpec="&#x0C4A;"
latin:moreKeys="&#x0C12;" />
<!-- U+0C02: "ం" TELUGU SIGN ANUSVARA
<!-- U+0C46: "ె" TELUGU VOWEL SIGN E
U+0C0E: "ఎ" TELUGU LETTER E -->
<Key
latin:keySpec="&#x0C02;"
latin:keySpec="&#x0C46;"
latin:moreKeys="&#x0C0E;" />
<!-- U+0C2E: "మ" TELUGU LETTER MA -->
<Key latin:keySpec="&#x0C2E;" />
<!-- U+0C2E: "మ" TELUGU LETTER MA
U+0C02: "ం" TELUGU SIGN ANUSVARA
U+0C01: "ఁ" TELUGU SIGN CANDRABINDU -->
<Key latin:keySpec="&#x0C2E;"
latin:moreKeys="&#x0C02;,&#x0C01;" />
<!-- U+0C28: "న" TELUGU LETTER NA
U+0C23: "ణ" TELUGU LETTER NNA
U+0C19: "ఙ" TELUGU LETTER NGA -->
U+0C19: "ఙ" TELUGU LETTER NGA
U+0C1E: "ఞ" TELUGU LETTER NYA -->
<Key
latin:keySpec="&#x0C28;"
latin:moreKeys="&#x0C23;,&#x0C19;" />
latin:moreKeys="&#x0C23;,&#x0C19;,&#x0C1E;" />
<!-- U+0C35: "వ" TELUGU LETTER VA -->
<Key latin:keySpec="&#x0C35;" />
<!-- U+0C32: "ల" TELUGU LETTER LA
@ -50,10 +54,10 @@
latin:keySpec="&#x0C38;"
latin:moreKeys="&#x0C36;" />
<!-- U+0C0B: "ఋ" TELUGU LETTER VOCALIC R
U+0C4D/U+0C30: "్ర" TELUGU SIGN VIRAMA/TELUGU LETTER RA -->
U+0C43: "ృ" TELUGU VOWEL SIGN VOCALIC R -->
<Key
latin:keySpec="&#x0C0B;"
latin:moreKeys="&#x0C4D;&#x0C30;" />
latin:moreKeys="&#x0C43;" />
<!-- U+0C37: "ష" TELUGU LETTER SSA
U+0C15/U+0C4D/U+0C37: "క్ష" TELUGU LETTER KA/TELUGU SIGN VIRAMA/TELUGU LETTER SSA -->
<Key

23
tests/src/com/android/inputmethod/keyboard/layout/Telugu.java
View File

@ -140,8 +140,8 @@ public final class Telugu extends LayoutBase {
key("\u0C2A", moreKey("\u0C2B")),
// U+0C30: "ర" TELUGU LETTER RA
// U+0C31: "ఱ" TELUGU LETTER RRA
// U+0C43: "ృ" TELUGU VOWEL SIGN VOCALIC R
key("\u0C30", joinMoreKeys("\u0C31", "\u0C43")),
// U+0C4D/U+0C30: "్ర" TELUGU SIGN VIRAMA/TELUGU LETTER RA
key("\u0C30", joinMoreKeys("\u0C31", "\u0C4D\u0C30")),
// U+0C15: "క" TELUGU LETTER KA
// U+0C16: "ఖ" TELUGU LETTER KHA
key("\u0C15", moreKey("\u0C16")),
@ -155,18 +155,21 @@ public final class Telugu extends LayoutBase {
// U+0C20: "ఠ" TELUGU LETTER TTHA
key("\u0C1F", moreKey("\u0C20")))
.setKeysOfRow(3,
// U+0C46: "ె" TELUGU VOWEL SIGN E
// U+0C4A: "ొ" TELUGU VOWEL SIGN O
// U+0C12: "ఒ" TELUGU LETTER O
key("\u0C46", moreKey("\u0C12")),
// U+0C02: "ం" TELUGU SIGN ANUSVARA
key("\u0C4A", moreKey("\u0C12")),
// U+0C46: "ె" TELUGU VOWEL SIGN E
// U+0C0E: "ఎ" TELUGU LETTER E
key("\u0C02", moreKey("\u0C0E")),
key("\u0C46", moreKey("\u0C0E")),
// U+0C2E: "మ" TELUGU LETTER MA
"\u0C2E",
// U+0C02: "ం" TELUGU SIGN ANUSVARA
// U+0C01: "ఁ" TELUGU SIGN CANDRABINDU
key("\u0C2E", joinMoreKeys("\u0C02", "\u0C01")),
// U+0C28: "న" TELUGU LETTER NA
// U+0C23: "ణ" TELUGU LETTER NNA
// U+0C19: "ఙ" TELUGU LETTER NGA
key("\u0C28", joinMoreKeys("\u0C23", "\u0C19")),
// U+0C1E: "ఞ" TELUGU LETTER NYA
key("\u0C28", joinMoreKeys("\u0C23", "\u0C19", "\u0C1E")),
// U+0C35: "వ" TELUGU LETTER VA
"\u0C35",
// U+0C32: "ల" TELUGU LETTER LA
@ -176,8 +179,8 @@ public final class Telugu extends LayoutBase {
// U+0C36: "శ" TELUGU LETTER SHA
key("\u0C38", moreKey("\u0C36")),
// U+0C0B: "ఋ" TELUGU LETTER VOCALIC R
// U+0C4D/U+0C30: "్ర" TELUGU SIGN VIRAMA/TELUGU LETTER RA
key("\u0C0B", moreKey("\u0C4D\u0C30")),
// U+0C43: "ృ" TELUGU VOWEL SIGN VOCALIC R
key("\u0C0B", moreKey("\u0C43")),
// U+0C37: "ష" TELUGU LETTER SSA
// U+0C15/U+0C4D/U+0C37:
// "క్ష" TELUGU LETTER KA/TELUGU SIGN VIRAMA/TELUGU LETTER SSA