am ec8d08af: am 34da7494: Merge "Update Hindi Compact keyboard layout" into lmp-dev

* commit 'ec8d08af28a598ab0321ffdb7aa302d95a99ec55':
  Update Hindi Compact keyboard layout
main
Tadashi G. Takaoka 2014-07-21 18:37:24 +00:00 committed by Android Git Automerger
commit 86b59df23c
5 changed files with 20 additions and 10 deletions

View File

@ -27,8 +27,13 @@
<case latin:keyboardLayoutSet="hindi_compact">
<!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
<key-style
latin:styleName="moreKeysDevanagariSignVirama"
latin:styleName="moreKeySpecDevanagariSignVirama"
latin:moreKeys="&#x094D;" />
<!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E
U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
<key-style
latin:styleName="moreKeysDevanagariSignVirama"
latin:moreKeys="&#x0945;,&#x090D;" />
</case>
<case latin:keyboardLayoutSet="marathi">
<!-- U+0905: "अ" DEVANAGARI LETTER A -->

View File

@ -28,8 +28,14 @@
<!-- U+25CC: "◌" DOTTED CIRCLE
U+094D: "्" DEVANAGARI SIGN VIRAMA -->
<key-style
latin:styleName="moreKeysDevanagariSignVirama"
latin:styleName="moreKeySpecDevanagariSignVirama"
latin:moreKeys="&#x25CC;&#x094D;|&#x094D;" />
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E
U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
<key-style
latin:styleName="moreKeysDevanagariSignVirama"
latin:moreKeys="&#x25CC;&#x0945;,&#x090D;" />
</case>
<case latin:keyboardLayoutSet="marathi">
<!-- U+0905: "अ" DEVANAGARI LETTER A -->

View File

@ -42,7 +42,7 @@
<!-- U+0905: "अ" DEVANAGARI LETTER A -->
<Key
latin:keySpec="&#x0905;"
latin:keyStyle="moreKeysDevanagariSignVirama" />
latin:keyStyle="moreKeySpecDevanagariSignVirama" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->

View File

@ -30,11 +30,8 @@
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->
<include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" />
<!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
<Key
latin:keySpec="&#x090D;"
latin:keyStyle="moreKeysDevanagariVowelSignCandraE" />
<include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
<Key latin:keyStyle="baseKeyDevanagariSignVirama" />
<!-- Because the font rendering system prior to API version 16 can't automatically
render dotted circle for incomplete combining letter of some scripts, different
set of Key definitions are needed based on the API version. -->

View File

@ -163,9 +163,11 @@ public final class HindiCompact extends LayoutBase {
// U+0911: "ऑ" DEVANAGARI LETTER CANDRA O
// U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
key("\u0911", moreKey(VOWEL_SIGN_CANDRA_O, "\u0949")),
// U+090D: "ऍ" DEVANAGARI LETTER CANDRA E
// U+094D: "्" DEVANAGARI SIGN VIRAMA
// U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E
key("\u090D", moreKey(VOWEL_SIGN_CANDRA_E, "\u0945")),
// U+090D: "ऍ" DEVANAGARI LETTER CANDRA E
key(SIGN_VIRAMA, "\u094D", joinMoreKeys(
moreKey(VOWEL_SIGN_CANDRA_E, "\u0945"), "\u090D")),
// U+0902: "ं" DEVANAGARI SIGN ANUSVARA
// U+0903: "" DEVANAGARI SIGN VISARGA
// U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU