Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec8d08af authored Jul 21, 2014 by Tadashi G. Takaoka Committed by Android Git Automerger Jul 21, 2014

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

* commit '34da7494':
  Update Hindi Compact keyboard layout

parents 9c6abf3e 34da7494

java/res/xml-v16/keystyle_devanagari_sign_virama.xml

+6 −1

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

java/res/xml/keystyle_devanagari_sign_virama.xml

+7 −1

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

java/res/xml/rowkeys_hindi_compact2.xml

+1 −1

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

java/res/xml/rowkeys_hindi_compact3.xml

+2 −5

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

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

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -163,9 +163,11 @@ public final class HindiCompact extends LayoutBase {
	// U+0911: "ऑ" DEVANAGARI LETTER CANDRA O		// U+0911: "ऑ" DEVANAGARI LETTER CANDRA O
	// U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O		// U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
	key("\u0911", moreKey(VOWEL_SIGN_CANDRA_O, "\u0949")),		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		// 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+0902: "ं" DEVANAGARI SIGN ANUSVARA
	// U+0903: "ः‍" DEVANAGARI SIGN VISARGA		// U+0903: "ः‍" DEVANAGARI SIGN VISARGA
	// U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU		// U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU