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

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

Merge "Tidy up 11-11-{7,8,9} 7-inch tablet layouts" into jb-dev

parents 3b7d40f4 2363d0c9

java/res/xml-sw600dp/rows_bulgarian.xml

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

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

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.727%p"

    >

        <include

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

    </Row>

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.727%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_bulgarian2"

            latin:keyXPos="4.500%p" />

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.65%p"

    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="10.0%p" />

            latin:keyWidth="11.75%p" />

        <include

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

        <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_east_slavic.xml

+5 −13
Original line number Diff line number Diff line
@@ -24,42 +24,34 @@ 
    <include

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

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.727%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_east_slavic1"

            latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />

        <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->

        <Key

            latin:keyLabel="&#x044A;" />

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.727%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_east_slavic2"

            latin:keyXPos="4.5%p" />

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="7.363%p"

        latin:keyWidth="7.727%p"

    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="10.0%p" />

            latin:keyWidth="11.75%p" />

        <include

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

        <include

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

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyXPos="-9.0%p"

            latin:keyWidth="fillRight" />

    </Row>

    <include

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

java/res/xml-sw600dp/rows_nordic.xml

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

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

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.727%p"

    >

        <include

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

    </Row>

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.727%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_nordic2"

            latin:keyXPos="4.5%p" />

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.727%p"

    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="10.0%p" />

            latin:keyWidth="11.75%p" />

        <Spacer

            latin:keyWidth="3.479%p" />

        <include

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

        <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_south_slavic.xml

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

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

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.727%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_south_slavic1"
@@ -34,29 +34,24 @@ 
            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.727%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_south_slavic2"

            latin:keyXPos="4.5%p" />

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="7.363%p"

        latin:keyWidth="7.727%p"

    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="10.0%p" />

            latin:keyWidth="11.75%p" />

        <include

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

        <include

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

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyXPos="-9.0%p"

            latin:keyWidth="fillRight" />

    </Row>

    <include

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