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

Commit d7b4af9b authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

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

* commit '67e264de':
  Add dotted circle to combination letter
parents 2d9b7f60 67e264de

java/res/xml-v16/key_hindi1_shift.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?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>

java/res/xml-v16/key_hindi3_right.xml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
<?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>

java/res/xml-v16/key_hindi3_shift_left.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?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>

java/res/xml-v16/key_hindi3_shift_right.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?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>

java/res/xml-v16/keys_hindi1_left5.xml

0 → 100644
+75 −0
Original line number Diff line number Diff line 
<?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>