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

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

Merge "Tidy up number password layout" into jb-dev

parents eca2912a 6de535c3

java/res/xml-sw600dp/rows_number_password.xml

+14 −12
Original line number Diff line number Diff line
@@ -31,9 +31,8 @@ 
            latin:keyStyle="num2KeyStyle" />

        <Key

            latin:keyStyle="num3KeyStyle" />

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyXPos="-16%p"

        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->

        <Spacer

            latin:keyWidth="fillRight" />

    </Row>

    <Row>
@@ -46,9 +45,8 @@ 
            latin:keyStyle="num5KeyStyle" />

        <Key

            latin:keyStyle="num6KeyStyle" />

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyXPos="-16%p"

        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->

        <Spacer

            latin:keyWidth="fillRight" />

    </Row>

    <Row>
@@ -62,17 +60,21 @@ 
        <Key

            latin:keyStyle="num9KeyStyle" />

        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->

        <Spacer />

        <Spacer

            latin:keyWidth="fillRight" />

    </Row>

    <Row>

        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->

        <Spacer

            latin:keyWidth="41%p" />

            latin:keyWidth="23%p" />

        <Key

            latin:keyStyle="deleteKeyStyle" />

        <Key

            latin:keyStyle="num0KeyStyle" />

        <include

            latin:keyXPos="-10%p"

            latin:keyWidth="fillRight"

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

        <Key

            latin:keyStyle="enterKeyStyle" />

        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->

        <Spacer

            latin:keyWidth="fillRight" />

    </Row>

</merge>

java/res/xml/rows_number_password.xml

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

>

    <Row>

        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->

        <Spacer

            latin:keyWidth="10%p" />

        <Key

            latin:keyStyle="num1KeyStyle" />

        <Key

            latin:keyStyle="num2KeyStyle" />

        <Key

            latin:keyStyle="num3KeyStyle" />

        <Spacer />

        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->

        <Spacer

            latin:keyWidth="fillRight" />

    </Row>

    <Row>

        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->

        <Spacer

            latin:keyWidth="10%p" />

        <Key

            latin:keyStyle="num4KeyStyle" />

        <Key

            latin:keyStyle="num5KeyStyle" />

        <Key

            latin:keyStyle="num6KeyStyle" />

        <Spacer />

        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->

        <Spacer

            latin:keyWidth="fillRight" />

    </Row>

    <Row>

        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->

        <Spacer

            latin:keyWidth="10%p" />

        <Key

            latin:keyStyle="num7KeyStyle" />

        <Key

            latin:keyStyle="num8KeyStyle" />

        <Key

            latin:keyStyle="num9KeyStyle" />

        <Key

            latin:keyStyle="deleteKeyStyle"

        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->

        <Spacer

            latin:keyWidth="fillRight" />

    </Row>

    <Row>

        <Spacer />

        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->

        <Spacer

            latin:keyWidth="10%p" />

        <Key

            latin:keyStyle="deleteKeyStyle" />

        <Key

            latin:keyStyle="num0KeyStyle" />

        <Spacer />

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyStyle="enterKeyStyle" />

        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->

        <Spacer

            latin:keyWidth="fillRight" />

    </Row>

</merge>