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

Commit c04075b1 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Cleanup <include/> and etc. in keyboard XML 

* Remove keyXPos and keyWidth from key_*.xml and make it more generic.
* Add keyXPos and keyWidth to <include/> generalized key_*.xml.
* Remove zero width <Spacer/> and fold into successive <include/>.

Change-Id: I4b5c02a165ba0bc9ef8741be0b4938c1efaf5e27
parent 9a7cdb20

java/res/xml-sw600dp/key_f1.xml

+1 −7
Original line number Diff line number Diff line
@@ -23,13 +23,7 @@ 
>

    <switch>

        <case

            latin:mode="email"

        >

            <Key

                latin:keyStyle="comKeyStyle" />

        </case>

        <case

            latin:mode="url"

            latin:mode="email|url"

        >

            <Key

                latin:keyStyle="comKeyStyle" />

java/res/xml-sw600dp/key_shortcut.xml

+3 −6
Original line number Diff line number Diff line
@@ -29,24 +29,21 @@ 
            <Key

                latin:keyStyle="shortcutKeyStyle"

                latin:keyLabelFlags="hasPopupHint|preserveCase"

                latin:moreKeys="!text/settings_as_more_key"

                latin:keyWidth="fillBoth" />

                latin:moreKeys="!text/settings_as_more_key" />

        </case>

        <case

            latin:shortcutKeyEnabled="true"

            latin:clobberSettingsKey="true"

        >

            <Key

                latin:keyStyle="shortcutKeyStyle"

                latin:keyWidth="fillBoth" />

                latin:keyStyle="shortcutKeyStyle" />

        </case>

        <case

            latin:shortcutKeyEnabled="false"

            latin:clobberSettingsKey="false"

        >

            <Key

                latin:keyStyle="settingsKeyStyle"

                latin:keyWidth="fillBoth" />

                latin:keyStyle="settingsKeyStyle" />

        </case>

        <!-- shortcutKeyEnabled="false" clobberSettingsKey="true" -->

        <default>

java/res/xml-sw600dp/key_space.xml

+0 −3
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ 
<merge

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

>

    <Spacer

        latin:keyWidth="0dp"

        latin:keyXPos="30.750%p" />

    <switch>

        <case

            latin:languageCode="fa"

java/res/xml-sw600dp/row_dvorak4.xml

+3 −3
Original line number Diff line number Diff line
@@ -32,15 +32,15 @@ 
        <include

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

        <include

            latin:keyXPos="30.750%p"

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

        <include

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

        <include

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

        <Spacer

            latin:keyXPos="-10.00%p"

            latin:keyWidth="0%p" />

        <include

            latin:keyXPos="-10.00%p"

            latin:keyWidth="fillRight"

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

    </Row>

</merge>