am 67e264de: Merge "Add dotted circle to combination letter" into jb-mr2-dev
* commit '67e264de6b2367bc7522b51b1b3f52445e5dde6a': Add dotted circle to combination lettermain
commit
d7b4af9b56
|
@ -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="ः"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
</merge>
|
|
@ -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="़"
|
||||
latin:moreKeys="ॽ,॰,ऽ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
</merge>
|
|
@ -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="ँ"
|
||||
latin:moreKeys="ॅ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
</merge>
|
|
@ -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="ृ"
|
||||
latin:moreKeys="ॄ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
</merge>
|
|
@ -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="ौ"
|
||||
latin:moreKeys="ौं,%"
|
||||
latin:keyHintLabel="1"
|
||||
latin:additionalMoreKeys="१,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="ै"
|
||||
latin:moreKeys="ैं,%"
|
||||
latin:keyHintLabel="2"
|
||||
latin:additionalMoreKeys="२,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="ा"
|
||||
latin:moreKeys="ां,ाँ,%"
|
||||
latin:keyHintLabel="3"
|
||||
latin:additionalMoreKeys="३,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="ी"
|
||||
latin:moreKeys="ीं,%"
|
||||
latin:keyHintLabel="4"
|
||||
latin:additionalMoreKeys="४,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="ू"
|
||||
latin:moreKeys="ूं,ूँ,%"
|
||||
latin:keyHintLabel="5"
|
||||
latin:additionalMoreKeys="५,5"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
</merge>
|
|
@ -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="ो"
|
||||
latin:moreKeys="ों,ॉ,ॊ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- U+0947: "े" DEVANAGARI VOWEL SIGN E
|
||||
U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
|
||||
<Key
|
||||
latin:keyLabel="े"
|
||||
latin:moreKeys="ें"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
|
||||
<Key
|
||||
latin:keyLabel="्"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I
|
||||
U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
|
||||
<Key
|
||||
latin:keyLabel="ि"
|
||||
latin:moreKeys="िं"
|
||||
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="ु"
|
||||
latin:moreKeys="ुं,ुँ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
</merge>
|
|
@ -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="ॉ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
|
||||
<Key
|
||||
latin:keyLabel="ं"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
</merge>
|
|
@ -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="◌ः"
|
||||
latin:code="0x0903"
|
||||
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
|
||||
</merge>
|
|
@ -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="◌़"
|
||||
latin:code="0x093C"
|
||||
latin:moreKeys="◌ॽ|ॽ,◌॰|॰,◌ऽ|ऽ"
|
||||
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
|
||||
</merge>
|
|
@ -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="◌ँ"
|
||||
latin:code="0x0901"
|
||||
latin:moreKeys="◌ॅ|ॅ"
|
||||
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
|
||||
</merge>
|
|
@ -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="◌ृ"
|
||||
latin:code="0x0943"
|
||||
latin:moreKeys="◌ॄ|ॄ"
|
||||
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
|
||||
</merge>
|
|
@ -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="◌ौ"
|
||||
latin:code="0x094C"
|
||||
latin:moreKeys="◌ौं|ौं,%"
|
||||
latin:keyHintLabel="1"
|
||||
latin:additionalMoreKeys="१,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="◌ै"
|
||||
latin:code="0x0948"
|
||||
latin:moreKeys="◌ैं|ैं,%"
|
||||
latin:keyHintLabel="2"
|
||||
latin:additionalMoreKeys="२,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="◌ा"
|
||||
latin:code="0x093E"
|
||||
latin:moreKeys="◌ां|ां,◌ाँ|ाँ,%"
|
||||
latin:keyHintLabel="3"
|
||||
latin:additionalMoreKeys="३,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="◌ी"
|
||||
latin:code="0x0940"
|
||||
latin:moreKeys="◌ीं|ीं,%"
|
||||
latin:keyHintLabel="4"
|
||||
latin:additionalMoreKeys="४,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="◌ू"
|
||||
latin:code="0x0942"
|
||||
latin:moreKeys="◌ूं|ूं,◌ूँ|ूँ,%"
|
||||
latin:keyHintLabel="5"
|
||||
latin:additionalMoreKeys="५,5"
|
||||
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
|
||||
</merge>
|
|
@ -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="◌ो"
|
||||
latin:code="0x094B"
|
||||
latin:moreKeys="◌ों|ों,◌ॉ,ॊ|ॉ,ॊ"
|
||||
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="◌े"
|
||||
latin:code="0x0947"
|
||||
latin:moreKeys="◌ें|ें"
|
||||
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
|
||||
<!-- U+25CC: "◌" DOTTED CIRCLE
|
||||
U+094D: "्" DEVANAGARI SIGN VIRAMA -->
|
||||
<Key
|
||||
latin:keyLabel="◌्"
|
||||
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="ि◌"
|
||||
latin:code="0x093F"
|
||||
latin:moreKeys="ि◌ं|िं"
|
||||
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="◌ु"
|
||||
latin:code="0x0941"
|
||||
latin:moreKeys="◌ुं|ुं,◌ुँ|ुँ"
|
||||
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
|
||||
</merge>
|
|
@ -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="◌ॉ"
|
||||
latin:code="0x0949"
|
||||
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
|
||||
<!-- U+25CC: "◌" DOTTED CIRCLE
|
||||
U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
|
||||
<Key
|
||||
latin:keyLabel="◌ं"
|
||||
latin:code="0x0902"
|
||||
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
|
||||
</merge>
|
|
@ -61,10 +61,11 @@
|
|||
<Key
|
||||
latin:keyLabel="भ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- U+0903: "ः" DEVANAGARI SIGN VISARGA -->
|
||||
<Key
|
||||
latin:keyLabel="ः"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- Because the font rendering system prior to API version 16 can't automatically
|
||||
render dotted circle for incomplete combining letter of Hindi, different set of
|
||||
Key definitions are needed based on the API version. -->
|
||||
<include
|
||||
latin:keyboardLayout="@xml/key_hindi1_shift" />
|
||||
<!-- U+0918: "घ" DEVANAGARI LETTER GHA -->
|
||||
<Key
|
||||
latin:keyLabel="घ"
|
||||
|
@ -86,53 +87,11 @@
|
|||
latin:keyLabelFlags="fontNormal" />
|
||||
</case>
|
||||
<default>
|
||||
<!-- 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="ौ"
|
||||
latin:moreKeys="ौं,%"
|
||||
latin:keyHintLabel="1"
|
||||
latin:additionalMoreKeys="१,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="ै"
|
||||
latin:moreKeys="ैं,%"
|
||||
latin:keyHintLabel="2"
|
||||
latin:additionalMoreKeys="२,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="ा"
|
||||
latin:moreKeys="ां,ाँ,%"
|
||||
latin:keyHintLabel="3"
|
||||
latin:additionalMoreKeys="३,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="ी"
|
||||
latin:moreKeys="ीं,%"
|
||||
latin:keyHintLabel="4"
|
||||
latin:additionalMoreKeys="४,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="ू"
|
||||
latin:moreKeys="ूं,ूँ,%"
|
||||
latin:keyHintLabel="5"
|
||||
latin:additionalMoreKeys="५,5"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- Because the font rendering system prior to API version 16 can't automatically
|
||||
render dotted circle for incomplete combining letter of Hindi, different set of
|
||||
Key definitions are needed based on the API version. -->
|
||||
<include
|
||||
latin:keyboardLayout="@xml/keys_hindi1_left5" />
|
||||
<!-- U+092C: "ब" DEVANAGARI LETTER BA
|
||||
U+092C/U+0952: "ब॒" DEVANAGARI LETTER BA/DEVANAGARI STRESS SIGN ANUDATTA -->
|
||||
<Key
|
||||
|
|
|
@ -96,37 +96,11 @@
|
|||
latin:keyLabelFlags="fontNormal" />
|
||||
</case>
|
||||
<default>
|
||||
<!-- 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="ो"
|
||||
latin:moreKeys="ों,ॉ,ॊ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- U+0947: "े" DEVANAGARI VOWEL SIGN E
|
||||
U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
|
||||
<Key
|
||||
latin:keyLabel="े"
|
||||
latin:moreKeys="ें"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
|
||||
<Key
|
||||
latin:keyLabel="्"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I
|
||||
U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
|
||||
<Key
|
||||
latin:keyLabel="ि"
|
||||
latin:moreKeys="िं"
|
||||
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="ु"
|
||||
latin:moreKeys="ुं,ुँ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- Because the font rendering system prior to API version 16 can't automatically
|
||||
render dotted circle for incomplete combining letter of Hindi, different set of
|
||||
Key definitions are needed based on the API version. -->
|
||||
<include
|
||||
latin:keyboardLayout="@xml/keys_hindi2_left5" />
|
||||
<!-- U+092A: "प" DEVANAGARI LETTER PA -->
|
||||
<Key
|
||||
latin:keyLabel="प"
|
||||
|
|
|
@ -29,12 +29,11 @@
|
|||
<Key
|
||||
latin:keyLabel="ऑ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
|
||||
U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E-->
|
||||
<Key
|
||||
latin:keyLabel="ँ"
|
||||
latin:moreKeys="ॅ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- Because the font rendering system prior to API version 16 can't automatically
|
||||
render dotted circle for incomplete combining letter of Hindi, different set of
|
||||
Key definitions are needed based on the API version. -->
|
||||
<include
|
||||
latin:keyboardLayout="@xml/key_hindi3_shift_left" />
|
||||
<!-- U+0923: "ण" DEVANAGARI LETTER NNA -->
|
||||
<Key
|
||||
latin:keyLabel="ण"
|
||||
|
@ -56,26 +55,22 @@
|
|||
<Key
|
||||
latin:keyLabel="ष"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R
|
||||
U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR -->
|
||||
<Key
|
||||
latin:keyLabel="ृ"
|
||||
latin:moreKeys="ॄ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- Because the font rendering system prior to API version 16 can't automatically
|
||||
render dotted circle for incomplete combining letter of Hindi, different set of
|
||||
Key definitions are needed based on the API version. -->
|
||||
<include
|
||||
latin:keyboardLayout="@xml/key_hindi3_shift_right" />
|
||||
<!-- U+091E: "ञ" DEVANAGARI LETTER NYA -->
|
||||
<Key
|
||||
latin:keyLabel="ञ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
</case>
|
||||
<default>
|
||||
<!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
|
||||
<Key
|
||||
latin:keyLabel="ॉ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
|
||||
<Key
|
||||
latin:keyLabel="ं"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- Because the font rendering system prior to API version 16 can't automatically
|
||||
render dotted circle for incomplete combining letter of Hindi, different set of
|
||||
Key definitions are needed based on the API version. -->
|
||||
<include
|
||||
latin:keyboardLayout="@xml/keys_hindi3_left2" />
|
||||
<!-- U+092E: "म" DEVANAGARI LETTER MA
|
||||
U+0950: "ॐ" DEVANAGARI OM -->
|
||||
<Key
|
||||
|
@ -111,14 +106,11 @@
|
|||
latin:keyLabel="य"
|
||||
latin:moreKeys="य़"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- U+093C: "़" DEVANAGARI SIGN NUKTA
|
||||
U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP
|
||||
U+0970: "॰" DEVANAGARI ABBREVIATION SIGN
|
||||
U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
|
||||
<Key
|
||||
latin:keyLabel="़"
|
||||
latin:moreKeys="ॽ,॰,ऽ"
|
||||
latin:keyLabelFlags="fontNormal" />
|
||||
<!-- Because the font rendering system prior to API version 16 can't automatically
|
||||
render dotted circle for incomplete combining letter of Hindi, different set of
|
||||
Key definitions are needed based on the API version. -->
|
||||
<include
|
||||
latin:keyboardLayout="@xml/key_hindi3_right" />
|
||||
</default>
|
||||
</switch>
|
||||
</merge>
|
||||
|
|
Loading…
Reference in New Issue