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

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

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

parents edde070a 4739b21b

java/res/xml-sw600dp/row_hebrew4.xml

+4 −3
Original line number Diff line number Diff line
@@ -22,19 +22,20 @@ 
    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="28.75%p"

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

        <include

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

        <include

            latin:keyXPos="-10.0%p"

            latin:keyXPos="-8.5%p"

            latin:keyWidth="fillRight"

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

    </Row>

java/res/xml-sw600dp/rows_10_10_7_symbols.xml

+4 −5
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ 
        latin:keyWidth="8.5%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_symbols2"

            latin:keyXPos="4.5%p" />

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillBoth" />
@@ -49,12 +48,12 @@ 
    >

        <Key

            latin:keyStyle="toMoreSymbolKeyStyle"

            latin:keyWidth="10.0%p" />

            latin:keyWidth="11.75%p" />

        <include

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

        <Key

            latin:keyLabel="/"

            latin:keyXPos="-8.5%p"

            latin:keyStyle="toMoreSymbolKeyStyle"

            latin:keyXPos="-11.75%p"

            latin:keyWidth="fillRight" />

    </Row>

    <include

java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml

+6 −3
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ 
        latin:keyWidth="8.5%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_symbols_shift2"

            latin:keyXPos="4.5%p" />

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillBoth" />
@@ -49,9 +48,13 @@ 
    >

        <Key

            latin:keyStyle="backFromMoreSymbolKeyStyle"

            latin:keyWidth="10.0%p" />

            latin:keyWidth="11.75%p" />

        <include

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

        <Key

            latin:keyStyle="backFromMoreSymbolKeyStyle"

            latin:keyXPos="-11.75%p"

            latin:keyWidth="fillRight" />

    </Row>

    <include

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

java/res/xml-sw600dp/rows_azerty.xml

+3 −4
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ 
        latin:keyWidth="8.5%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_azerty2"

            latin:keyXPos="4.5%p" />

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillBoth" />
@@ -48,14 +47,14 @@ 
    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="10.0%p" />

            latin:keyWidth="11.75%p" />

        <include

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

        <include

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

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyXPos="-10.0%p"

            latin:keyXPos="-11.75%p"

            latin:keyWidth="fillRight" />

    </Row>

    <include

java/res/xml-sw600dp/rows_colemak.xml

+3 −4
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ 
        latin:keyWidth="8.5%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_colemak2"

            latin:keyXPos="4.5%p" />

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillBoth" />
@@ -50,14 +49,14 @@ 
    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="10.0%p" />

            latin:keyWidth="11.75%p" />

        <include

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

        <include

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

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyXPos="-10.0%p"

            latin:keyXPos="-11.75%p"

            latin:keyWidth="fillRight" />

    </Row>

    <include