Consolidate Esperanto layout into Spanish layout
This change also removes AsciiCapable extra value from Esperanto
subtype.
Change-Id: I0fa18ef7c52e4ba24b182e8ecb9788572660b704
diff --git a/java/res/xml/kbd_esperanto.xml b/java/res/xml/kbd_esperanto.xml
deleted file mode 100644
index c0c45dd..0000000
--- a/java/res/xml/kbd_esperanto.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/rows_esperanto" />
-</Keyboard>
diff --git a/java/res/xml/keyboard_layout_set_esperanto.xml b/java/res/xml/keyboard_layout_set_esperanto.xml
deleted file mode 100644
index 94a386d..0000000
--- a/java/res/xml/keyboard_layout_set_esperanto.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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.
-*/
--->
-
-<KeyboardLayoutSet
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
- <Element
- latin:elementName="alphabet"
- latin:elementKeyboard="@xml/kbd_esperanto"
- latin:enableProximityCharsCorrection="true" />
- <Element
- latin:elementName="symbols"
- latin:elementKeyboard="@xml/kbd_symbols" />
- <Element
- latin:elementName="symbolsShifted"
- latin:elementKeyboard="@xml/kbd_symbols_shift" />
- <Element
- latin:elementName="phone"
- latin:elementKeyboard="@xml/kbd_phone" />
- <Element
- latin:elementName="phoneSymbols"
- latin:elementKeyboard="@xml/kbd_phone_symbols" />
- <Element
- latin:elementName="number"
- latin:elementKeyboard="@xml/kbd_number" />
-</KeyboardLayoutSet>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 9b769f6..613e9f6 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -34,7 +34,7 @@
el: Greek/greek
en_US: English United States/qwerty
en_GB: English Great Britain/qwerty
- eo: Esperanto/esperanto
+ eo: Esperanto/spanish
es: Spanish/spanish
et: Estonian/nordic
fa: Persian/arabic
@@ -157,7 +157,7 @@
android:label="@string/subtype_generic"
android:imeSubtypeLocale="eo"
android:imeSubtypeMode="keyboard"
- android:imeSubtypeExtraValue="KeyboardLayoutSet=esperanto,AsciiCapable"
+ android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish"
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic"
diff --git a/java/res/xml/rowkeys_esperanto1.xml b/java/res/xml/rowkeys_esperanto1.xml
deleted file mode 100644
index 6994d4b..0000000
--- a/java/res/xml/rowkeys_esperanto1.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?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+015D: "ŝ" LATIN SMALL LETTER S WITH CIRCUMFLEX -->
- <Key
- latin:keyLabel="ŝ"
- latin:keyHintLabel="1"
- latin:additionalMoreKeys="1"
- latin:moreKeys="q" />
- <!-- U+011D: "ĝ" LATIN SMALL LETTER G WITH CIRCUMFLEX
- U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX -->
- <Key
- latin:keyLabel="ĝ"
- latin:keyHintLabel="2"
- latin:additionalMoreKeys="2"
- latin:moreKeys="w,ŵ" />
- <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
- U+011B: "ě" LATIN SMALL LETTER E WITH CARON
- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
- U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
- U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
- U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
- U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
- U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
- <Key
- latin:keyLabel="e"
- latin:keyHintLabel="3"
- latin:additionalMoreKeys="3"
- latin:moreKeys="é,ě,è,ê,ë,ę,ė,ē" />
- <!-- U+0159: "ř" LATIN SMALL LETTER R WITH CARON
- U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE
- U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA -->
- <Key
- latin:keyLabel="r"
- latin:keyHintLabel="4"
- latin:additionalMoreKeys="4"
- latin:moreKeys="ř,ŕ,ŗ" />
- <!-- U+0165: "ť" LATIN SMALL LETTER T WITH CARON
- U+021B: "ț" LATIN SMALL LETTER T WITH COMMA BELOW
- U+0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA
- U+0167: "ŧ" LATIN SMALL LETTER T WITH STROKE -->
- <Key
- latin:keyLabel="t"
- latin:keyHintLabel="5"
- latin:additionalMoreKeys="5"
- latin:moreKeys="ť,ț,ţ,ŧ" />
- <!-- U+016D: "ŭ" LATIN SMALL LETTER U WITH BREVE
- U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
- U+0177: "ŷ" LATIN SMALL LETTER Y WITH CIRCUMFLEX
- U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
- U+00FE: "þ" LATIN SMALL LETTER THORN -->
- <Key
- latin:keyLabel="ŭ"
- latin:keyHintLabel="6"
- latin:additionalMoreKeys="6"
- latin:moreKeys="y,ý,ŷ,ÿ,þ" />
- <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
- U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE
- U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
- U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
- U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
- U+016B: "ū" LATIN SMALL LETTER U WITH MACRON
- U+0169: "ũ" LATIN SMALL LETTER U WITH TILDE
- U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE
- U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK
- U+00B5: "µ" MICRO SIGN -->
- <Key
- latin:keyLabel="u"
- latin:keyHintLabel="7"
- latin:additionalMoreKeys="7"
- latin:moreKeys="ú,ů,û,ü,ù,ū,ũ,ű,ų,µ" />
- <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
- U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
- U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
- U+0129: "ĩ" LATIN SMALL LETTER I WITH TILDE
- U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
- U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
- U+012B: "ī" LATIN SMALL LETTER I WITH MACRON
- U+0131: "ı" LATIN SMALL LETTER DOTLESS I
- U+0133: "ij" LATIN SMALL LIGATURE IJ -->
- <Key
- latin:keyLabel="i"
- latin:keyHintLabel="8"
- latin:additionalMoreKeys="8"
- latin:moreKeys="í,î,ï,ĩ,ì,į,ī,ı,ij" />
- <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
- U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
- U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
- U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
- U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
- U+0153: "œ" LATIN SMALL LIGATURE OE
- U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
- U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
- U+0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE
- U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
- <Key
- latin:keyLabel="o"
- latin:keyHintLabel="9"
- latin:additionalMoreKeys="9"
- latin:moreKeys="ó,ö,ô,ò,õ,œ,ø,ō,ő,º" />
- <Key
- latin:keyLabel="p"
- latin:keyHintLabel="0"
- latin:additionalMoreKeys="0" />
-</merge>
diff --git a/java/res/xml/rowkeys_esperanto2.xml b/java/res/xml/rowkeys_esperanto2.xml
deleted file mode 100644
index ebc968a..0000000
--- a/java/res/xml/rowkeys_esperanto2.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
- U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
- U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
- U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
- U+00E6: "æ" LATIN SMALL LETTER AE
- U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
- U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
- U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
- U+0103: "ă" LATIN SMALL LETTER A WITH BREVE
- U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK
- U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
- <Key
- latin:keyLabel="a"
- latin:moreKeys="á,à,â,ä,æ,ã,å,ā,ă,ą,ª" />
- <!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S
- U+0161: "š" LATIN SMALL LETTER S WITH CARON
- U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
- U+0219: "ș" LATIN SMALL LETTER S WITH COMMA BELOW
- U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA -->
- <Key
- latin:keyLabel="s"
- latin:moreKeys="ß,š,ś,ș,ş" />
- <!-- U+00F0: "ð" LATIN SMALL LETTER ETH
- U+010F: "ď" LATIN SMALL LETTER D WITH CARON
- U+0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
- <Key
- latin:keyLabel="d"
- latin:moreKeys="ð,ď,đ" />
- <Key
- latin:keyLabel="f" />
- <!-- U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE
- U+0121: "ġ" LATIN SMALL LETTER G WITH DOT ABOVE
- U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA -->
- <Key
- latin:keyLabel="g"
- latin:moreKeys="ğ,ġ,ģ" />
- <!-- U+0125: "ĥ" LATIN SMALL LETTER H WITH CIRCUMFLEX
- U+0127: "ħ" LATIN SMALL LETTER H WITH STROKE -->
- <Key
- latin:keyLabel="h"
- latin:moreKeys="ĥ,ħ" />
- <Key
- latin:keyLabel="j" />
- <!-- U+0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA
- U+0138: "ĸ" LATIN SMALL LETTER KRA -->
- <Key
- latin:keyLabel="k"
- latin:moreKeys="ķ,ĸ" />
- <!-- U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE
- U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA
- U+013E: "ľ" LATIN SMALL LETTER L WITH CARON
- U+0140: "ŀ" LATIN SMALL LETTER L WITH MIDDLE DOT
- U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
- <Key
- latin:keyLabel="l"
- latin:moreKeys="ĺ,ļ,ľ,ŀ,ł" />
- <!-- U+0135: "ĵ" LATIN SMALL LETTER J WITH CIRCUMFLEX -->
- <Key
- latin:keyLabel="ĵ" />
-</merge>
diff --git a/java/res/xml/rowkeys_esperanto3.xml b/java/res/xml/rowkeys_esperanto3.xml
deleted file mode 100644
index b2eab8d..0000000
--- a/java/res/xml/rowkeys_esperanto3.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
- U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON -->
- <Key
- latin:keyLabel="z"
- latin:moreKeys="ź,ż,ž" />
- <!-- U+0109: "ĉ" LATIN SMALL LETTER C WITH CIRCUMFLEX -->
- <Key
- latin:keyLabel="ĉ"
- latin:moreKeys="x" />
- <!-- U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
- U+010D: "č" LATIN SMALL LETTER C WITH CARON
- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
- U+010B: "ċ" LATIN SMALL LETTER C WITH DOT ABOVE -->
- <Key
- latin:keyLabel="c"
- latin:moreKeys="ć,č,ç,ċ" />
- <!-- U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX -->
- <Key
- latin:keyLabel="v"
- latin:moreKeys="w,ŵ" />
- <Key
- latin:keyLabel="b" />
- <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
- U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
- U+0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA
- U+0148: "ň" LATIN SMALL LETTER N WITH CARON
- U+0149: "ʼn" LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
- U+014B: "ŋ" LATIN SMALL LETTER ENG -->
- <Key
- latin:keyLabel="n"
- latin:moreKeys="ñ,ń,ņ,ň,ʼn,ŋ" />
- <Key
- latin:keyLabel="m" />
-</merge>
diff --git a/java/res/xml/rowkeys_qwerty1.xml b/java/res/xml/rowkeys_qwerty1.xml
index 84d6134..e7c9b59 100644
--- a/java/res/xml/rowkeys_qwerty1.xml
+++ b/java/res/xml/rowkeys_qwerty1.xml
@@ -22,11 +22,12 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="q"
+ latin:keyLabel="!text/keylabel_for_q"
latin:keyHintLabel="1"
- latin:additionalMoreKeys="1" />
+ latin:additionalMoreKeys="1"
+ latin:moreKeys="!text/more_keys_for_q" />
<Key
- latin:keyLabel="w"
+ latin:keyLabel="!text/keylabel_for_w"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="!text/more_keys_for_w" />
@@ -46,7 +47,7 @@
latin:additionalMoreKeys="5"
latin:moreKeys="!text/more_keys_for_t" />
<Key
- latin:keyLabel="y"
+ latin:keyLabel="!text/keylabel_for_y"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
latin:moreKeys="!text/more_keys_for_y" />
diff --git a/java/res/xml/rowkeys_qwerty3.xml b/java/res/xml/rowkeys_qwerty3.xml
index a74aeb8..b70fd72 100644
--- a/java/res/xml/rowkeys_qwerty3.xml
+++ b/java/res/xml/rowkeys_qwerty3.xml
@@ -25,7 +25,8 @@
latin:keyLabel="z"
latin:moreKeys="!text/more_keys_for_z" />
<Key
- latin:keyLabel="x" />
+ latin:keyLabel="!text/keylabel_for_x"
+ latin:moreKeys="!text/more_keys_for_x" />
<Key
latin:keyLabel="c"
latin:moreKeys="!text/more_keys_for_c" />
diff --git a/java/res/xml/rowkeys_spanish2.xml b/java/res/xml/rowkeys_spanish2.xml
index 4c7e579..335dff3 100644
--- a/java/res/xml/rowkeys_spanish2.xml
+++ b/java/res/xml/rowkeys_spanish2.xml
@@ -25,5 +25,5 @@
latin:keyboardLayout="@xml/rowkeys_qwerty2" />
<!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
<Key
- latin:keyLabel="ñ" />
+ latin:keyLabel="!text/keylabel_for_spanish_row2_10" />
</merge>
diff --git a/java/res/xml/rows_esperanto.xml b/java/res/xml/rows_esperanto.xml
deleted file mode 100644
index c5f626e..0000000
--- a/java/res/xml/rows_esperanto.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
- <Row
- latin:keyWidth="10%p"
- >
- <include
- latin:keyboardLayout="@xml/rowkeys_esperanto1" />
- </Row>
- <Row
- latin:keyWidth="10%p"
- >
- <include
- latin:keyboardLayout="@xml/rowkeys_esperanto2" />
- </Row>
- <Row
- latin:keyWidth="10%p"
- >
- <Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="15%p"
- latin:visualInsetsRight="1%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_esperanto3" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillRight"
- latin:visualInsetsLeft="1%p" />
- </Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>