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

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

Merge "Tidy up Arabic and Farsi 7-inch layouts" into jb-dev

parents c44a3e07 09d942e0

java/res/xml-sw600dp/rows_arabic.xml

+5 −6
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_arabic1" />
@@ -33,21 +33,20 @@ 
            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.727%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_arabic2"

            latin:keyXPos="4.5%p" />

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.727%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_arabic3"

            latin:keyXPos="10.0%p" />

            latin:keyXPos="7.727%p" />

    </Row>

    <include

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

java/res/xml-sw600dp/rows_farsi.xml

+9 −16
Original line number Diff line number Diff line
@@ -24,38 +24,31 @@ 
    <include

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

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.727%p"

    >

        <include

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

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.727%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_farsi2"

            latin:keyXPos="4.5%p" />

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="7.6%p"

        latin:keyWidth="7.727%p"

    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="10.0%p" />

        <include

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

            latin:keyboardLayout="@xml/rowkeys_farsi3"

            latin:keyXPos="7.727%p" />

        <include

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

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyXPos="-10.0%p"

            latin:keyWidth="fillRight" />

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillBoth" />

    </Row>

    <include

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