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

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

Merge "Tidy up 10-9-7 7-inch tablet layouts" into jb-dev

parents 684c519d 5fc2c22d

java/res/xml-sw600dp/key_space.xml

+4 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
                latin:keyStyle="languageSwitchKeyStyle" />

            <Key

                latin:keyStyle="spaceKeyStyle"

                latin:keyWidth="21.950%p" />

                latin:keyWidth="25.50%p" />

            <Key

                latin:keyStyle="zwnjKeyStyle" />

        </case>
@@ -40,7 +40,7 @@ 
        >

            <Key

                latin:keyStyle="spaceKeyStyle"

                latin:keyWidth="30.850%p" />

                latin:keyWidth="34.00%p" />

            <Key

                latin:keyStyle="zwnjKeyStyle" />

        </case>
@@ -51,13 +51,13 @@ 
                latin:keyStyle="languageSwitchKeyStyle" />

            <Key

                latin:keyStyle="spaceKeyStyle"

                latin:keyWidth="30.850%p" />

                latin:keyWidth="34.00%p" />

        </case>

        <!-- languageSwitchKeyEnabled="false" -->

        <default>

            <Key

                latin:keyStyle="spaceKeyStyle"

                latin:keyWidth="39.750%p" />

                latin:keyWidth="42.50%p" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/row_qwerty4.xml

+4 −4
Original line number Diff line number Diff line
@@ -22,22 +22,22 @@ 
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <Row

        latin:keyWidth="8.9%p"

        latin:keyWidth="8.5%p"

    >

        <Key

            latin:keyStyle="toSymbolKeyStyle"

            latin:keyWidth="13.0%p" />

            latin:keyWidth="11.75%p" />

        <include

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

        <include

            latin:keyXPos="30.750%p"

            latin:keyXPos="28.75%p"

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

        <include

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

        <include

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

        <include

            latin:keyXPos="-10.00%p"

            latin:keyXPos="-8.5%p"

            latin:keyWidth="fillRight"

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

    </Row>

java/res/xml-sw600dp/row_symbols4.xml

+4 −4
Original line number Diff line number Diff line
@@ -22,17 +22,17 @@ 
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <Row

        latin:keyWidth="8.9%p"

        latin:keyWidth="8.5%p"

    >

        <Key

            latin:keyStyle="toAlphaKeyStyle"

            latin:keyWidth="13.0%p" />

            latin:keyWidth="11.75%p" />

        <Key

            latin:keyStyle="smileyKeyStyle" />

        <Key

            latin:keyLabel="\@" />

        <include

            latin:keyXPos="30.750%p"

            latin:keyXPos="28.75%p"

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

        <Key

            latin:keyLabel="&quot;"
@@ -40,7 +40,7 @@ 
        <Key

            latin:keyLabel="_" />

        <include

            latin:keyXPos="-10.0%p"

            latin:keyXPos="-8.5%p"

            latin:keyWidth="fillRight"

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

    </Row>

java/res/xml-sw600dp/row_symbols_shift4.xml

+4 −4
Original line number Diff line number Diff line
@@ -22,18 +22,18 @@ 
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <Row

        latin:keyWidth="8.9%p"

        latin:keyWidth="8.5%p"

    >

        <Key

            latin:keyStyle="toAlphaKeyStyle"

            latin:keyWidth="13.0%p" />

            latin:keyWidth="11.75%p" />

        <Key

            latin:keyStyle="smileyKeyStyle" />

        <include

            latin:keyXPos="30.750%p"

            latin:keyXPos="28.75%p"

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

        <include

            latin:keyXPos="-10.00%p"

            latin:keyXPos="-8.5%p"

            latin:keyWidth="fillRight"

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

    </Row>

java/res/xml-sw600dp/rows_georgian.xml

+6 −6
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    <include

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

    <Row

        latin:keyWidth="9.0%p"

        latin:keyWidth="8.5%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_georgian1"
@@ -34,28 +34,28 @@ 
            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="9.0%p"

        latin:keyWidth="8.5%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_georgian2"

            latin:keyXPos="4.5%p" />

            latin:keyXPos="5.875%p" />

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="9.0%p"

        latin:keyWidth="8.5%p"

    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="10.0%p" />

            latin:keyWidth="11.75%p" />

        <include

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

        <include

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

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyXPos="-9.0%p"

            latin:keyXPos="-11.75%p"

            latin:keyWidth="fillRight" />

    </Row>

    <include