From b577005a360f26d090a83b9243f125a8a43c99d2 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" <takaoka@google.com> Date: Mon, 12 Mar 2012 11:12:36 +0900 Subject: [PATCH] Breakdown Serbian keyboard into rows This change also slightly re-design 7-inch and 10-inch tablet layout Change-Id: Ibfe11386d865f7c3becf4a60286557921f95036d --- java/res/xml-sw600dp/rowkeys_serbian1.xml | 58 +++++++++++ java/res/xml-sw600dp/rows_serbian.xml | 99 ++---------------- java/res/xml-sw768dp/rows_serbian.xml | 111 ++------------------ java/res/xml/rowkeys_serbian1.xml | 78 ++++++++++++++ java/res/xml/rowkeys_serbian2.xml | 56 ++++++++++ java/res/xml/rowkeys_serbian3.xml | 49 +++++++++ java/res/xml/rows_serbian.xml | 119 ++-------------------- 7 files changed, 265 insertions(+), 305 deletions(-) create mode 100644 java/res/xml-sw600dp/rowkeys_serbian1.xml create mode 100644 java/res/xml/rowkeys_serbian1.xml create mode 100644 java/res/xml/rowkeys_serbian2.xml create mode 100644 java/res/xml/rowkeys_serbian3.xml diff --git a/java/res/xml-sw600dp/rowkeys_serbian1.xml b/java/res/xml-sw600dp/rowkeys_serbian1.xml new file mode 100644 index 0000000000..aa0d5bbe3a --- /dev/null +++ b/java/res/xml-sw600dp/rowkeys_serbian1.xml @@ -0,0 +1,58 @@ +<?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> diff --git a/java/res/xml-sw600dp/rows_serbian.xml b/java/res/xml-sw600dp/rows_serbian.xml index 989fa488cc..62a87c29a2 100644 --- a/java/res/xml-sw600dp/rows_serbian.xml +++ b/java/res/xml-sw600dp/rows_serbian.xml @@ -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 diff --git a/java/res/xml-sw768dp/rows_serbian.xml b/java/res/xml-sw768dp/rows_serbian.xml index 62668e5cc2..fe3da2f448 100644 --- a/java/res/xml-sw768dp/rows_serbian.xml +++ b/java/res/xml-sw768dp/rows_serbian.xml @@ -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" /> diff --git a/java/res/xml/rowkeys_serbian1.xml b/java/res/xml/rowkeys_serbian1.xml new file mode 100644 index 0000000000..5485d866e1 --- /dev/null +++ b/java/res/xml/rowkeys_serbian1.xml @@ -0,0 +1,78 @@ +<?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> diff --git a/java/res/xml/rowkeys_serbian2.xml b/java/res/xml/rowkeys_serbian2.xml new file mode 100644 index 0000000000..f30f42c1ac --- /dev/null +++ b/java/res/xml/rowkeys_serbian2.xml @@ -0,0 +1,56 @@ +<?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> diff --git a/java/res/xml/rowkeys_serbian3.xml b/java/res/xml/rowkeys_serbian3.xml new file mode 100644 index 0000000000..303fad8c7c --- /dev/null +++ b/java/res/xml/rowkeys_serbian3.xml @@ -0,0 +1,49 @@ +<?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" +> + <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="ж" /> +</merge> diff --git a/java/res/xml/rows_serbian.xml b/java/res/xml/rows_serbian.xml index ed33dc7513..f3f4084c90 100644 --- a/java/res/xml/rows_serbian.xml +++ b/java/res/xml/rows_serbian.xml @@ -26,98 +26,14 @@ <Row latin:keyWidth="9.091%p" > - <!-- 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="ш" - latin:keyWidth="fillRight" /> + <include + latin:keyboardLayout="@xml/rowkeys_serbian1" /> </Row> <Row latin:keyWidth="9.091%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" - latin:keyWidth="fillRight" /> + <include + latin:keyboardLayout="@xml/rowkeys_serbian2" /> </Row> <Row latin:keyWidth="8.5%p" @@ -125,31 +41,8 @@ <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="11.75%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" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> -- GitLab