Merge "Breakdown Serbian keyboard into rows" (df22f71a) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml-sw600dp/rowkeys_serbian1.xml

0 → 100644

+58 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2012, 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.
		*/
		-->

		<merge
		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
		>
		<!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->
		<Key
		latin:keyLabel="љ" />
		<!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->
		<Key
		latin:keyLabel="њ" />
		<!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
		<Key
		latin:keyLabel="е"
		latin:moreKeys="@string/more_keys_for_cyrillic_ie" />
		<!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
		<Key
		latin:keyLabel="р" />
		<!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
		<Key
		latin:keyLabel="т" />
		<Key
		latin:keyLabel="@string/keylabel_for_cyrillic_ze" />
		<!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
		<Key
		latin:keyLabel="у" />
		<!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
		<Key
		latin:keyLabel="и"
		latin:moreKeys="@string/more_keys_for_cyrillic_i" />
		<!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
		<Key
		latin:keyLabel="о" />
		<!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
		<Key
		latin:keyLabel="п" />
		<!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
		<Key
		latin:keyLabel="ш" />
		</merge>

java/res/xml-sw600dp/rows_serbian.xml

+7 −92

Original line number	Diff line number	Diff line
		@@ -26,41 +26,8 @@
		<Row
		latin:keyWidth="8.0%p"
		>
		<!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->
		<Key
		latin:keyLabel="љ"
		latin:keyXPos="2.15%p" />
		<!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->
		<Key
		latin:keyLabel="њ" />
		<!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
		<Key
		latin:keyLabel="е"
		latin:moreKeys="@string/more_keys_for_cyrillic_ie" />
		<!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
		<Key
		latin:keyLabel="р" />
		<!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
		<Key
		latin:keyLabel="т" />
		<Key
		latin:keyLabel="@string/keylabel_for_cyrillic_ze" />
		<!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
		<Key
		latin:keyLabel="у" />
		<!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
		<Key
		latin:keyLabel="и"
		latin:moreKeys="@string/more_keys_for_cyrillic_i" />
		<!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
		<Key
		latin:keyLabel="о" />
		<!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
		<Key
		latin:keyLabel="п" />
		<!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
		<Key
		latin:keyLabel="ш" />
		<include
		latin:keyboardLayout="@xml/rowkeys_serbian1" />
		<Key
		latin:keyStyle="deleteKeyStyle"
		latin:keyXPos="-10.0%p"
		@@ -69,38 +36,9 @@
		<Row
		latin:keyWidth="7.9%p"
		>
		<!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
		<Key
		latin:keyLabel="а" />
		<!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
		<Key
		latin:keyLabel="с" />
		<!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
		<Key
		latin:keyLabel="д" />
		<!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
		<Key
		latin:keyLabel="ф" />
		<!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
		<Key
		latin:keyLabel="г" />
		<!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
		<Key
		latin:keyLabel="х" />
		<!-- U+0458: "ј" CYRILLIC SMALL LETTER JE -->
		<Key
		latin:keyLabel="ј" />
		<!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
		<Key
		latin:keyLabel="к" />
		<!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
		<Key
		latin:keyLabel="л" />
		<!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
		<Key
		latin:keyLabel="ч" />
		<Key
		latin:keyLabel="@string/keylabel_for_cyrillic_tshe" />
		<include
		latin:keyboardLayout="@xml/rowkeys_serbian2"
		latin:keyXPos="2.15%p" />
		<Key
		latin:keyStyle="enterKeyStyle"
		latin:keyXPos="-14.6%p"
		@@ -112,31 +50,8 @@
		<Key
		latin:keyStyle="shiftKeyStyle"
		latin:keyWidth="8.0%p" />
		<Key
		latin:keyLabel="@string/keylabel_for_cyrillic_dze" />
		<!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE -->
		<Key
		latin:keyLabel="џ" />
		<!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
		<Key
		latin:keyLabel="ц" />
		<!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
		<Key
		latin:keyLabel="в" />
		<!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
		<Key
		latin:keyLabel="б" />
		<!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
		<Key
		latin:keyLabel="н" />
		<!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
		<Key
		latin:keyLabel="м" />
		<Key
		latin:keyLabel="@string/keylabel_for_cyrillic_dje" />
		<!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
		<Key
		latin:keyLabel="ж" />
		<include
		latin:keyboardLayout="@xml/rowkeys_serbian3" />
		<include
		latin:keyboardLayout="@xml/keys_comma_period" />
		<include

java/res/xml-sw768dp/rows_serbian.xml

+11 −100

Original line number	Diff line number	Diff line
		@@ -29,47 +29,12 @@
		<Key
		latin:keyStyle="tabKeyStyle"
		latin:keyLabelFlags="alignLeft" />
		<!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->
		<Key
		latin:keyLabel="љ" />
		<!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->
		<Key
		latin:keyLabel="њ" />
		<!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
		<Key
		latin:keyLabel="е"
		latin:moreKeys="@string/more_keys_for_cyrillic_ie" />
		<!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
		<Key
		latin:keyLabel="р" />
		<!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
		<Key
		latin:keyLabel="т" />
		<Key
		latin:keyLabel="@string/keylabel_for_cyrillic_ze" />
		<!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
		<Key
		latin:keyLabel="у" />
		<!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
		<Key
		latin:keyLabel="и"
		latin:moreKeys="@string/more_keys_for_cyrillic_i" />
		<!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
		<Key
		latin:keyLabel="о" />
		<!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
		<Key
		latin:keyLabel="п" />
		<!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
		<Key
		latin:keyLabel="ш" />
		<!-- U+0452: "ђ" CYRILLIC SMALL LETTER DJE -->
		<Key
		latin:keyLabel="ђ" />
		<!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
		<include
		latin:keyboardLayout="@xml/rowkeys_serbian1" />
		<Key
		latin:keyLabel="ж"
		latin:keyWidth="fillRight" />
		latin:keyStyle="deleteKeyStyle"
		latin:keyXPos="-9.219%p"
		latin:keyWidth="fillBoth" />
		</Row>
		<Row
		latin:keyWidth="7.250%p"
		@@ -78,41 +43,11 @@
		latin:keyStyle="toSymbolKeyStyle"
		latin:keyLabelFlags="alignLeft"
		latin:keyWidth="11.172%p" />
		<!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
		<Key
		latin:keyLabel="а" />
		<!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
		<Key
		latin:keyLabel="с" />
		<!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
		<Key
		latin:keyLabel="д" />
		<!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
		<Key
		latin:keyLabel="ф" />
		<!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
		<Key
		latin:keyLabel="г" />
		<!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
		<Key
		latin:keyLabel="х" />
		<!-- U+0458: "ј" CYRILLIC SMALL LETTER JE -->
		<Key
		latin:keyLabel="ј" />
		<!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
		<Key
		latin:keyLabel="к" />
		<!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
		<Key
		latin:keyLabel="л" />
		<!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
		<Key
		latin:keyLabel="ч" />
		<Key
		latin:keyLabel="@string/keylabel_for_cyrillic_tshe" />
		<include
		latin:keyboardLayout="@xml/rowkeys_serbian2" />
		<Key
		latin:keyStyle="deleteKeyStyle"
		latin:keyXPos="-9.219%p"
		latin:keyStyle="enterKeyStyle"
		latin:keyXPos="-15.704%p"
		latin:keyWidth="fillBoth" />
		</Row>
		<Row
		@@ -121,34 +56,10 @@
		<Key
		latin:keyStyle="shiftKeyStyle"
		latin:keyWidth="13.829%p" />
		<Key
		latin:keyLabel="@string/keylabel_for_cyrillic_dze" />
		<!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE -->
		<Key
		latin:keyLabel="џ" />
		<!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
		<Key
		latin:keyLabel="ц" />
		<!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
		<Key
		latin:keyLabel="в" />
		<!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
		<Key
		latin:keyLabel="б" />
		<!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
		<Key
		latin:keyLabel="н" />
		<!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
		<Key
		latin:keyLabel="м" />
		<Key
		latin:keyLabel="@string/keylabel_for_cyrillic_dje" />
		<include
		latin:keyboardLayout="@xml/rowkeys_serbian3" />
		<include
		latin:keyboardLayout="@xml/keys_comma_period" />
		<Key
		latin:keyStyle="enterKeyStyle"
		latin:keyXPos="-13.750%p"
		latin:keyWidth="fillRight" />
		</Row>
		<include
		latin:keyboardLayout="@xml/row_qwerty4" />

java/res/xml/rowkeys_serbian1.xml

0 → 100644

+78 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2012, 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.
		*/
		-->

		<merge
		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
		>
		<!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->
		<Key
		latin:keyLabel="љ"
		latin:keyHintLabel="1"
		latin:additionalMoreKeys="1" />
		<!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->
		<Key
		latin:keyLabel="њ"
		latin:keyHintLabel="2"
		latin:additionalMoreKeys="2" />
		<!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
		<Key
		latin:keyLabel="е"
		latin:keyHintLabel="3"
		latin:additionalMoreKeys="3"
		latin:moreKeys="@string/more_keys_for_cyrillic_ie" />
		<!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
		<Key
		latin:keyLabel="р"
		latin:keyHintLabel="4"
		latin:additionalMoreKeys="4" />
		<!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
		<Key
		latin:keyLabel="т"
		latin:keyHintLabel="5"
		latin:additionalMoreKeys="5" />
		<Key
		latin:keyLabel="@string/keylabel_for_cyrillic_ze"
		latin:keyHintLabel="6"
		latin:additionalMoreKeys="6" />
		<!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
		<Key
		latin:keyLabel="у"
		latin:keyHintLabel="7"
		latin:additionalMoreKeys="7" />
		<!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
		<Key
		latin:keyLabel="и"
		latin:keyHintLabel="8"
		latin:additionalMoreKeys="8"
		latin:moreKeys="@string/more_keys_for_cyrillic_i" />
		<!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
		<Key
		latin:keyLabel="о"
		latin:keyHintLabel="9"
		latin:additionalMoreKeys="9" />
		<!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
		<Key
		latin:keyLabel="п"
		latin:keyHintLabel="0"
		latin:additionalMoreKeys="0" />
		<!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
		<Key
		latin:keyLabel="ш" />
		</merge>

java/res/xml/rowkeys_serbian2.xml

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2012, 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.
		*/
		-->

		<merge
		xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
		>
		<!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
		<Key
		latin:keyLabel="а" />
		<!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
		<Key
		latin:keyLabel="с" />
		<!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
		<Key
		latin:keyLabel="д" />
		<!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
		<Key
		latin:keyLabel="ф" />
		<!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
		<Key
		latin:keyLabel="г" />
		<!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
		<Key
		latin:keyLabel="х" />
		<!-- U+0458: "ј" CYRILLIC SMALL LETTER JE -->
		<Key
		latin:keyLabel="ј" />
		<!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
		<Key
		latin:keyLabel="к" />
		<!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
		<Key
		latin:keyLabel="л" />
		<!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
		<Key
		latin:keyLabel="ч" />
		<Key
		latin:keyLabel="@string/keylabel_for_cyrillic_tshe" />
		</merge>