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

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

Merge "Consolidate Esperanto layout into Spanish layout" into jb-mr1-dev

parents 9357ceba eceea877

java/res/xml-sw600dp/rows_esperanto.xml

deleted100644 → 0
+0 −61
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"

>

    <include

        latin:keyboardLayout="@xml/key_styles_common" />

    <Row

        latin:keyWidth="9.0%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_esperanto1"

            latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillRight" />

    </Row>

    <Row

        latin:keyWidth="9.0%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_esperanto2" />

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillRight" />

    </Row>

    <Row

        latin:keyWidth="9.0%p"

    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="10.0%p" />

        <include

            latin:keyboardLayout="@xml/rowkeys_esperanto3" />

        <include

            latin:keyboardLayout="@xml/keys_comma_period" />

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="fillRight" />

    </Row>

    <include

        latin:keyboardLayout="@xml/row_qwerty4" />

</merge>

java/res/xml-sw768dp/rows_esperanto.xml

deleted100644 → 0
+0 −69
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"

>

    <include

        latin:keyboardLayout="@xml/key_styles_common" />

    <Row

        latin:keyWidth="8.282%p"

    >

        <Key

            latin:keyStyle="tabKeyStyle"

            latin:keyLabelFlags="alignLeft"

            latin:keyWidth="7.969%p" />

        <include

            latin:keyboardLayout="@xml/rowkeys_esperanto1"

            latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillRight"/>

    </Row>

    <Row

        latin:keyWidth="8.125%p"

    >

        <Key

            latin:keyStyle="toSymbolKeyStyle"

            latin:keyLabelFlags="alignLeft"

            latin:keyWidth="10.167%"/>

        <include

            latin:keyboardLayout="@xml/rowkeys_esperanto2" />

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillRight" />

    </Row>

    <Row

        latin:keyWidth="8.047%p"

    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="13.829%p"/>

        <include

            latin:keyboardLayout="@xml/rowkeys_esperanto3" />

        <include

            latin:keyboardLayout="@xml/keys_comma_period" />

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="fillRight" />

    </Row>

    <include

        latin:keyboardLayout="@xml/row_qwerty4" />

</merge>

java/res/xml/kbd_esperanto.xml

deleted100644 → 0
+0 −26
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.

*/

-->



<Keyboard

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

>

    <include

        latin:keyboardLayout="@xml/rows_esperanto" />

</Keyboard>

java/res/xml/keyboard_layout_set_esperanto.xml

deleted100644 → 0
+0 −42
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.

*/

-->



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

java/res/xml/method.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"