am d7b4af9b: am 67e264de: Merge "Add dotted circle to combination letter" into jb-mr2-dev

* commit 'd7b4af9b560fb11ca0acb78ca937a0eeb06e147c':
  Add dotted circle to combination letter
This commit is contained in:
Tadashi G. Takaoka 2013-03-11 02:07:10 -07:00 committed by Android Git Automerger
commit 4660cf5c5b
17 changed files with 679 additions and 110 deletions

View file

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The code point U+25CC for key label is needed because the font rendering system prior to
API version 16 can't automatically render dotted circle for incomplete combining letter
of Hindi. The files named res/xml/{key,keys}_hindi*.xml have this U+25CC hack, although the
counterpart files named res/xml-v16/{key,keys}_hindi*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+0903: "" DEVANAGARI SIGN VISARGA -->
<Key
latin:keyLabel="&#x0903;"
latin:keyLabelFlags="fontNormal" />
</merge>

View file

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The code point U+25CC for key label is needed because the font rendering system prior to
API version 16 can't automatically render dotted circle for incomplete combining letter
of Hindi. The files named res/xml/{key,keys}_hindi*.xml have this U+25CC hack, although the
counterpart files named res/xml-v16/{key,keys}_hindi*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+093C: "़" DEVANAGARI SIGN NUKTA
U+097D: "" DEVANAGARI LETTER GLOTTAL STOP
U+0970: "॰" DEVANAGARI ABBREVIATION SIGN
U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
<Key
latin:keyLabel="&#x093C;"
latin:moreKeys="&#x097D;,&#x0970;,&#x093D;"
latin:keyLabelFlags="fontNormal" />
</merge>

View file

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The code point U+25CC for key label is needed because the font rendering system prior to
API version 16 can't automatically render dotted circle for incomplete combining letter
of Hindi. The files named res/xml/{key,keys}_hindi*.xml have this U+25CC hack, although the
counterpart files named res/xml-v16/{key,keys}_hindi*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
<Key
latin:keyLabel="&#x0901;"
latin:moreKeys="&#x0945;"
latin:keyLabelFlags="fontNormal" />
</merge>

View file

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The code point U+25CC for key label is needed because the font rendering system prior to
API version 16 can't automatically render dotted circle for incomplete combining letter
of Hindi. The files named res/xml/{key,keys}_hindi*.xml have this U+25CC hack, although the
counterpart files named res/xml-v16/{key,keys}_hindi*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R
U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR -->
<Key
latin:keyLabel="&#x0943;"
latin:moreKeys="&#x0944;"
latin:keyLabelFlags="fontNormal" />
</merge>

View file

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The code point U+25CC for key label is needed because the font rendering system prior to
API version 16 can't automatically render dotted circle for incomplete combining letter
of Hindi. The files named res/xml/{key,keys}_hindi*.xml have this U+25CC hack, although the
counterpart files named res/xml-v16/{key,keys}_hindi*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU
U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA
U+0967: "१" DEVANAGARI DIGIT ONE -->
<Key
latin:keyLabel="&#x094C;"
latin:moreKeys="&#x094C;&#x0902;,%"
latin:keyHintLabel="1"
latin:additionalMoreKeys="&#x0967;,1"
latin:keyLabelFlags="fontNormal" />
<!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI
U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA
U+0968: "२" DEVANAGARI DIGIT TWO -->
<Key
latin:keyLabel="&#x0948;"
latin:moreKeys="&#x0948;&#x0902;,%"
latin:keyHintLabel="2"
latin:additionalMoreKeys="&#x0968;,2"
latin:keyLabelFlags="fontNormal" />
<!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA
U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA
U+093E/U+0901: "ाँ" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU
U+0969: "३" DEVANAGARI DIGIT THREE -->
<Key
latin:keyLabel="&#x093E;"
latin:moreKeys="&#x093E;&#x0902;,&#x093E;&#x0901;,%"
latin:keyHintLabel="3"
latin:additionalMoreKeys="&#x0969;,3"
latin:keyLabelFlags="fontNormal" />
<!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II
U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA
U+096A: "४" DEVANAGARI DIGIT FOUR -->
<Key
latin:keyLabel="&#x0940;"
latin:moreKeys="&#x0940;&#x0902;,%"
latin:keyHintLabel="4"
latin:additionalMoreKeys="&#x096A;,4"
latin:keyLabelFlags="fontNormal" />
<!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU
U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA
U+0942/U+0901: "ूँ" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU
U+096B: "५" DEVANAGARI DIGIT FIVE -->
<Key
latin:keyLabel="&#x0942;"
latin:moreKeys="&#x0942;&#x0902;,&#x0942;&#x0901;,%"
latin:keyHintLabel="5"
latin:additionalMoreKeys="&#x096B;,5"
latin:keyLabelFlags="fontNormal" />
</merge>

View file

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The code point U+25CC for key label is needed because the font rendering system prior to
API version 16 can't automatically render dotted circle for incomplete combining letter
of Hindi. The files named res/xml/{key,keys}_hindi*.xml have this U+25CC hack, although the
counterpart files named res/xml-v16/{key,keys}_hindi*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O
U+094B/U+0902: "қं" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O -->
<Key
latin:keyLabel="&#x094B;"
latin:moreKeys="&#x094B;&#x0902;,&#x0949;,&#x094A;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0947: "े" DEVANAGARI VOWEL SIGN E
U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keyLabel="&#x0947;"
latin:moreKeys="&#x0947;&#x0902;"
latin:keyLabelFlags="fontNormal" />
<!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
<Key
latin:keyLabel="&#x094D;"
latin:keyLabelFlags="fontNormal" />
<!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I
U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keyLabel="&#x093F;"
latin:moreKeys="&#x093F;&#x0902;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U
U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA
U+0941/U+0901: "ुँ" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU -->
<Key
latin:keyLabel="&#x0941;"
latin:moreKeys="&#x0941;&#x0902;,&#x0941;&#x0901;"
latin:keyLabelFlags="fontNormal" />
</merge>

View file

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The code point U+25CC for key label is needed because the font rendering system prior to
API version 16 can't automatically render dotted circle for incomplete combining letter
of Hindi. The files named res/xml/{key,keys}_hindi*.xml have this U+25CC hack, although the
counterpart files named res/xml-v16/{key,keys}_hindi*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
<Key
latin:keyLabel="&#x0949;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keyLabel="&#x0902;"
latin:keyLabelFlags="fontNormal" />
</merge>

View file

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The code point U+25CC for key label is needed because the font rendering system prior to
API version 16 can't automatically render dotted circle for incomplete combining letter
of Hindi. The files named res/xml/{key,keys}_hindi*.xml have this U+25CC hack, although the
counterpart files named res/xml-v16/{key,keys}_hindi*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0903: "" DEVANAGARI SIGN VISARGA -->
<Key
latin:keyLabel="&#x25CC;&#x0903;"
latin:code="0x0903"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>

View file

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The code point U+25CC for key label is needed because the font rendering system prior to
API version 16 can't automatically render dotted circle for incomplete combining letter
of Hindi. The files named res/xml/{key,keys}_hindi*.xml have this U+25CC hack, although the
counterpart files named res/xml-v16/{key,keys}_hindi*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+25CC: "◌" DOTTED CIRCLE
U+093C: "़" DEVANAGARI SIGN NUKTA
U+097D: "" DEVANAGARI LETTER GLOTTAL STOP
U+0970: "॰" DEVANAGARI ABBREVIATION SIGN
U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
<Key
latin:keyLabel="&#x25CC;&#x093C;"
latin:code="0x093C"
latin:moreKeys="&#x25CC;&#x097D;|&#x097D;,&#x25CC;&#x0970;|&#x0970;,&#x25CC;&#x093D;|&#x093D;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>

View file

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The code point U+25CC for key label is needed because the font rendering system prior to
API version 16 can't automatically render dotted circle for incomplete combining letter
of Hindi. The files named res/xml/{key,keys}_hindi*.xml have this U+25CC hack, although the
counterpart files named res/xml-v16/{key,keys}_hindi*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
<Key
latin:keyLabel="&#x25CC;&#x0901;"
latin:code="0x0901"
latin:moreKeys="&#x25CC;&#x0945;|&#x0945;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>

View file

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The code point U+25CC for key label is needed because the font rendering system prior to
API version 16 can't automatically render dotted circle for incomplete combining letter
of Hindi. The files named res/xml/{key,keys}_hindi*.xml have this U+25CC hack, although the
counterpart files named res/xml-v16/{key,keys}_hindi*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R
U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR -->
<Key
latin:keyLabel="&#x25CC;&#x0943;"
latin:code="0x0943"
latin:moreKeys="&#x25CC;&#x0944;|&#x0944;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>

View file

@ -0,0 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The code point U+25CC for key label is needed because the font rendering system prior to
API version 16 can't automatically render dotted circle for incomplete combining letter
of Hindi. The files named res/xml/{key,keys}_hindi*.xml have this U+25CC hack, although the
counterpart files named res/xml-v16/{key,keys}_hindi*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+25CC: "◌" DOTTED CIRCLE
U+094C: "ौ" DEVANAGARI VOWEL SIGN AU
U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA
U+0967: "१" DEVANAGARI DIGIT ONE -->
<Key
latin:keyLabel="&#x25CC;&#x094C;"
latin:code="0x094C"
latin:moreKeys="&#x25CC;&#x094C;&#x0902;|&#x094C;&#x0902;,%"
latin:keyHintLabel="1"
latin:additionalMoreKeys="&#x0967;,1"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0948: "ै" DEVANAGARI VOWEL SIGN AI
U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA
U+0968: "२" DEVANAGARI DIGIT TWO -->
<Key
latin:keyLabel="&#x25CC;&#x0948;"
latin:code="0x0948"
latin:moreKeys="&#x25CC;&#x0948;&#x0902;|&#x0948;&#x0902;,%"
latin:keyHintLabel="2"
latin:additionalMoreKeys="&#x0968;,2"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+25CC: "◌" DOTTED CIRCLE
U+093E: "ा" DEVANAGARI VOWEL SIGN AA
U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA
U+093E/U+0901: "ाँ" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU
U+0969: "३" DEVANAGARI DIGIT THREE -->
<Key
latin:keyLabel="&#x25CC;&#x093E;"
latin:code="0x093E"
latin:moreKeys="&#x25CC;&#x093E;&#x0902;|&#x093E;&#x0902;,&#x25CC;&#x093E;&#x0901;|&#x093E;&#x0901;,%"
latin:keyHintLabel="3"
latin:additionalMoreKeys="&#x0969;,3"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0940: "ी" DEVANAGARI VOWEL SIGN II
U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA
U+096A: "४" DEVANAGARI DIGIT FOUR -->
<Key
latin:keyLabel="&#x25CC;&#x0940;"
latin:code="0x0940"
latin:moreKeys="&#x25CC;&#x0940;&#x0902;|&#x0940;&#x0902;,%"
latin:keyHintLabel="4"
latin:additionalMoreKeys="&#x096A;,4"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0942: "ू" DEVANAGARI VOWEL SIGN UU
U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA
U+0942/U+0901: "ूँ" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU
U+096B: "५" DEVANAGARI DIGIT FIVE -->
<Key
latin:keyLabel="&#x25CC;&#x0942;"
latin:code="0x0942"
latin:moreKeys="&#x25CC;&#x0942;&#x0902;|&#x0942;&#x0902;,&#x25CC;&#x0942;&#x0901;|&#x0942;&#x0901;,%"
latin:keyHintLabel="5"
latin:additionalMoreKeys="&#x096B;,5"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>

View file

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The code point U+25CC for key label is needed because the font rendering system prior to
API version 16 can't automatically render dotted circle for incomplete combining letter
of Hindi. The files named res/xml/{key,keys}_hindi*.xml have this U+25CC hack, although the
counterpart files named res/xml-v16/{key,keys}_hindi*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+25CC: "◌" DOTTED CIRCLE
U+094B: "ो" DEVANAGARI VOWEL SIGN O
U+094B/U+0902: "қं" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O -->
<Key
latin:keyLabel="&#x25CC;&#x094B;"
latin:code="0x094B"
latin:moreKeys="&#x25CC;&#x094B;&#x0902;|&#x094B;&#x0902;,&#x25CC;&#x0949;,&#x094A;|&#x0949;,&#x094A;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0947: "े" DEVANAGARI VOWEL SIGN E
U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keyLabel="&#x25CC;&#x0947;"
latin:code="0x0947"
latin:moreKeys="&#x25CC;&#x0947;&#x0902;|&#x0947;&#x0902;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+25CC: "◌" DOTTED CIRCLE
U+094D: "्" DEVANAGARI SIGN VIRAMA -->
<Key
latin:keyLabel="&#x25CC;&#x094D;"
latin:code="0x094D"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+25CC: "◌" DOTTED CIRCLE
U+093F: "ि" DEVANAGARI VOWEL SIGN I
U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keyLabel="&#x093F;&#x25CC;"
latin:code="0x093F"
latin:moreKeys="&#x093F;&#x25CC;&#x0902;|&#x093F;&#x0902;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0941: "ु" DEVANAGARI VOWEL SIGN U
U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA
U+0941/U+0901: "ुँ" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU -->
<Key
latin:keyLabel="&#x25CC;&#x0941;"
latin:code="0x0941"
latin:moreKeys="&#x25CC;&#x0941;&#x0902;|&#x0941;&#x0902;,&#x25CC;&#x0941;&#x0901;|&#x0941;&#x0901;"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>

View file

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The code point U+25CC for key label is needed because the font rendering system prior to
API version 16 can't automatically render dotted circle for incomplete combining letter
of Hindi. The files named res/xml/{key,keys}_hindi*.xml have this U+25CC hack, although the
counterpart files named res/xml-v16/{key,keys}_hindi*.xml don't have this hack. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
<Key
latin:keyLabel="&#x25CC;&#x0949;"
latin:code="0x0949"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keyLabel="&#x25CC;&#x0902;"
latin:code="0x0902"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</merge>

View file

@ -61,10 +61,11 @@
<Key <Key
latin:keyLabel="&#x092D;" latin:keyLabel="&#x092D;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0903: "" DEVANAGARI SIGN VISARGA --> <!-- Because the font rendering system prior to API version 16 can't automatically
<Key render dotted circle for incomplete combining letter of Hindi, different set of
latin:keyLabel="&#x0903;" Key definitions are needed based on the API version. -->
latin:keyLabelFlags="fontNormal" /> <include
latin:keyboardLayout="@xml/key_hindi1_shift" />
<!-- U+0918: "घ" DEVANAGARI LETTER GHA --> <!-- U+0918: "घ" DEVANAGARI LETTER GHA -->
<Key <Key
latin:keyLabel="&#x0918;" latin:keyLabel="&#x0918;"
@ -86,53 +87,11 @@
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
</case> </case>
<default> <default>
<!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU <!-- Because the font rendering system prior to API version 16 can't automatically
U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA render dotted circle for incomplete combining letter of Hindi, different set of
U+0967: "१" DEVANAGARI DIGIT ONE --> Key definitions are needed based on the API version. -->
<Key <include
latin:keyLabel="&#x094C;" latin:keyboardLayout="@xml/keys_hindi1_left5" />
latin:moreKeys="&#x094C;&#x0902;,%"
latin:keyHintLabel="1"
latin:additionalMoreKeys="&#x0967;,1"
latin:keyLabelFlags="fontNormal" />
<!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI
U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA
U+0968: "२" DEVANAGARI DIGIT TWO -->
<Key
latin:keyLabel="&#x0948;"
latin:moreKeys="&#x0948;&#x0902;,%"
latin:keyHintLabel="2"
latin:additionalMoreKeys="&#x0968;,2"
latin:keyLabelFlags="fontNormal" />
<!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA
U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA
U+093E/U+0901: "ाँ" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU
U+0969: "३" DEVANAGARI DIGIT THREE -->
<Key
latin:keyLabel="&#x093E;"
latin:moreKeys="&#x093E;&#x0902;,&#x093E;&#x0901;,%"
latin:keyHintLabel="3"
latin:additionalMoreKeys="&#x0969;,3"
latin:keyLabelFlags="fontNormal" />
<!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II
U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA
U+096A: "४" DEVANAGARI DIGIT FOUR -->
<Key
latin:keyLabel="&#x0940;"
latin:moreKeys="&#x0940;&#x0902;,%"
latin:keyHintLabel="4"
latin:additionalMoreKeys="&#x096A;,4"
latin:keyLabelFlags="fontNormal" />
<!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU
U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA
U+0942/U+0901: "ूँ" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU
U+096B: "५" DEVANAGARI DIGIT FIVE -->
<Key
latin:keyLabel="&#x0942;"
latin:moreKeys="&#x0942;&#x0902;,&#x0942;&#x0901;,%"
latin:keyHintLabel="5"
latin:additionalMoreKeys="&#x096B;,5"
latin:keyLabelFlags="fontNormal" />
<!-- U+092C: "ब" DEVANAGARI LETTER BA <!-- U+092C: "ब" DEVANAGARI LETTER BA
U+092C/U+0952: "ब॒" DEVANAGARI LETTER BA/DEVANAGARI STRESS SIGN ANUDATTA --> U+092C/U+0952: "ब॒" DEVANAGARI LETTER BA/DEVANAGARI STRESS SIGN ANUDATTA -->
<Key <Key

View file

@ -96,37 +96,11 @@
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
</case> </case>
<default> <default>
<!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O <!-- Because the font rendering system prior to API version 16 can't automatically
U+094B/U+0902: "қं" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA render dotted circle for incomplete combining letter of Hindi, different set of
U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O Key definitions are needed based on the API version. -->
U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O --> <include
<Key latin:keyboardLayout="@xml/keys_hindi2_left5" />
latin:keyLabel="&#x094B;"
latin:moreKeys="&#x094B;&#x0902;,&#x0949;,&#x094A;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0947: "े" DEVANAGARI VOWEL SIGN E
U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keyLabel="&#x0947;"
latin:moreKeys="&#x0947;&#x0902;"
latin:keyLabelFlags="fontNormal" />
<!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
<Key
latin:keyLabel="&#x094D;"
latin:keyLabelFlags="fontNormal" />
<!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I
U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keyLabel="&#x093F;"
latin:moreKeys="&#x093F;&#x0902;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U
U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA
U+0941/U+0901: "ुँ" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU -->
<Key
latin:keyLabel="&#x0941;"
latin:moreKeys="&#x0941;&#x0902;,&#x0941;&#x0901;"
latin:keyLabelFlags="fontNormal" />
<!-- U+092A: "प" DEVANAGARI LETTER PA --> <!-- U+092A: "प" DEVANAGARI LETTER PA -->
<Key <Key
latin:keyLabel="&#x092A;" latin:keyLabel="&#x092A;"

View file

@ -29,12 +29,11 @@
<Key <Key
latin:keyLabel="&#x0911;" latin:keyLabel="&#x0911;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU <!-- Because the font rendering system prior to API version 16 can't automatically
U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E--> render dotted circle for incomplete combining letter of Hindi, different set of
<Key Key definitions are needed based on the API version. -->
latin:keyLabel="&#x0901;" <include
latin:moreKeys="&#x0945;" latin:keyboardLayout="@xml/key_hindi3_shift_left" />
latin:keyLabelFlags="fontNormal" />
<!-- U+0923: "ण" DEVANAGARI LETTER NNA --> <!-- U+0923: "ण" DEVANAGARI LETTER NNA -->
<Key <Key
latin:keyLabel="&#x0923;" latin:keyLabel="&#x0923;"
@ -56,26 +55,22 @@
<Key <Key
latin:keyLabel="&#x0937;" latin:keyLabel="&#x0937;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R <!-- Because the font rendering system prior to API version 16 can't automatically
U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR --> render dotted circle for incomplete combining letter of Hindi, different set of
<Key Key definitions are needed based on the API version. -->
latin:keyLabel="&#x0943;" <include
latin:moreKeys="&#x0944;" latin:keyboardLayout="@xml/key_hindi3_shift_right" />
latin:keyLabelFlags="fontNormal" />
<!-- U+091E: "ञ" DEVANAGARI LETTER NYA --> <!-- U+091E: "ञ" DEVANAGARI LETTER NYA -->
<Key <Key
latin:keyLabel="&#x091E;" latin:keyLabel="&#x091E;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
</case> </case>
<default> <default>
<!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O --> <!-- Because the font rendering system prior to API version 16 can't automatically
<Key render dotted circle for incomplete combining letter of Hindi, different set of
latin:keyLabel="&#x0949;" Key definitions are needed based on the API version. -->
latin:keyLabelFlags="fontNormal" /> <include
<!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA --> latin:keyboardLayout="@xml/keys_hindi3_left2" />
<Key
latin:keyLabel="&#x0902;"
latin:keyLabelFlags="fontNormal" />
<!-- U+092E: "म" DEVANAGARI LETTER MA <!-- U+092E: "म" DEVANAGARI LETTER MA
U+0950: "ॐ" DEVANAGARI OM --> U+0950: "ॐ" DEVANAGARI OM -->
<Key <Key
@ -111,14 +106,11 @@
latin:keyLabel="&#x092F;" latin:keyLabel="&#x092F;"
latin:moreKeys="&#x095F;" latin:moreKeys="&#x095F;"
latin:keyLabelFlags="fontNormal" /> latin:keyLabelFlags="fontNormal" />
<!-- U+093C: "़" DEVANAGARI SIGN NUKTA <!-- Because the font rendering system prior to API version 16 can't automatically
U+097D: "" DEVANAGARI LETTER GLOTTAL STOP render dotted circle for incomplete combining letter of Hindi, different set of
U+0970: "॰" DEVANAGARI ABBREVIATION SIGN Key definitions are needed based on the API version. -->
U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA --> <include
<Key latin:keyboardLayout="@xml/key_hindi3_right" />
latin:keyLabel="&#x093C;"
latin:moreKeys="&#x097D;,&#x0970;,&#x093D;"
latin:keyLabelFlags="fontNormal" />
</default> </default>
</switch> </switch>
</merge> </merge>