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

Commit 4e6e9ef3 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Clean up Devanagari key definitions"

parents 2cbc7c68 f1ec134d

java/res/xml-v16/key_nepali_romanized3_shift_center.xml→java/res/xml-v16/key_devanagari_sign_anusvara.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 


<!-- 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}_nepali*.xml have this U+25CC hack, although the

     counterpart files named res/xml-v16/{key,keys}_nepali*.xml don't have this hack. -->

     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the

     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->

<merge

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

java/res/xml-v16/key_nepali_romanized3_shift_left.xml→java/res/xml-v16/key_devanagari_sign_candrabindu.xml

+18 −2
Original line number Diff line number Diff line
@@ -20,13 +20,29 @@ 


<!-- 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}_nepali*.xml have this U+25CC hack, although the

     counterpart files named res/xml-v16/{key,keys}_nepali*.xml don't have this hack. -->

     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the

     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->

<merge

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <switch>

        <case

            latin:keyboardLayoutSet="hindi"

        >

            <!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU

                 U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->

            <key-style

                latin:styleName="moreKeysDevanagariSignCandrabindu"

                latin:moreKeys="&#x0945;" />

        </case>

        <default>

             <key-style

                latin:styleName="moreKeysDevanagariSignCandrabindu" />

        </default>

    </switch>

    <!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->

    <Key

        latin:keyStyle="moreKeysDevanagariSignCandrabindu"

        latin:keyLabel="&#x0901;"

        latin:keyLabelFlags="fontNormal" />

</merge>

java/res/xml-v16/key_hindi3_right.xml→java/res/xml-v16/key_devanagari_sign_nukta.xml

+20 −7
Original line number Diff line number Diff line
@@ -20,17 +20,30 @@ 


<!-- 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. -->

     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the

     counterpart files named res/xml-v16/key_*.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

    <switch>

        <case

            latin:keyboardLayoutSet="hindi"

        >

            <!-- U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP

                 U+0970: "॰" DEVANAGARI ABBREVIATION SIGN

                 U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->

             <key-style

                latin:styleName="moreKeysDevanagariSignNukta"

                latin:moreKeys="&#x097D;,&#x0970;,&#x093D;" />

        </case>

        <default>

             <key-style

                latin:styleName="moreKeysDevanagariSignNukta" />

        </default>

    </switch>

    <!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->

    <Key

        latin:keyStyle="moreKeysDevanagariSignNukta"

        latin:keyLabel="&#x093C;"

        latin:moreKeys="&#x097D;,&#x0970;,&#x093D;"

        latin:keyLabelFlags="fontNormal" />

</merge>

java/res/xml-v16/key_nepali_romanized3_shift_right.xml→java/res/xml-v16/key_devanagari_sign_virama.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 


<!-- 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}_nepali*.xml have this U+25CC hack, although the

     counterpart files named res/xml-v16/{key,keys}_nepali*.xml don't have this hack. -->

     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the

     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->

<merge

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

java/res/xml-v16/key_hindi1_shift.xml→java/res/xml-v16/key_devanagari_sign_visarga.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 


<!-- 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. -->

     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the

     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->

<merge

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>