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

Commit eef3b7b3 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Add number password keyboard layout to phone (DO NOT MERGE)

Bug: 4479212
Change-Id: Ia0a284a365af99257ed47351bdd3387fd9a53eba
parent 88100d36
Loading
Loading
Loading
Loading
+117 −58
Original line number Diff line number Diff line
@@ -33,6 +33,63 @@
        latin:keyboardLayout="@xml/kbd_key_styles" />
    <include
        latin:keyboardLayout="@xml/kbd_numkey_styles" />
    <switch>
        <case
            latin:passwordInput="true"
        >
            <Row
                latin:rowEdgeFlags="top"
            >
                <Key
                    latin:keyStyle="num1KeyStyle"
                    latin:keyEdgeFlags="left" />
                <Key
                    latin:keyStyle="num2KeyStyle" />
                <Key
                    latin:keyStyle="num3KeyStyle" />
                <Spacer
                    latin:horizontalGap="20%p" />
            </Row>
            <Row>
                <Key
                    latin:keyStyle="num4KeyStyle"
                    latin:keyEdgeFlags="left" />
                <Key
                    latin:keyStyle="num5KeyStyle" />
                <Key
                    latin:keyStyle="num6KeyStyle" />
                <Spacer
                    latin:horizontalGap="20%p" />
            </Row>
            <Row>
                <Key
                    latin:keyStyle="num7KeyStyle"
                    latin:keyEdgeFlags="left" />
                <Key
                    latin:keyStyle="num8KeyStyle" />
                <Key
                    latin:keyStyle="num9KeyStyle" />
                <Key
                    latin:keyStyle="deleteKeyStyle"
                    latin:keyWidth="20%p"
                    latin:keyEdgeFlags="right" />
            </Row>
            <Row
                latin:rowEdgeFlags="bottom"
            >
                <Spacer
                    latin:horizontalGap="26.67%p" />
                <Key
                    latin:keyStyle="num0KeyStyle" />
                <Spacer
                    latin:horizontalGap="26.67%p" />
                <Key
                    latin:keyStyle="returnKeyStyle"
                    latin:keyWidth="20%p"
                    latin:keyEdgeFlags="right" />
            </Row>
        </case>
        <default>
            <Row
                latin:rowEdgeFlags="top"
            >
@@ -91,4 +148,6 @@
                    latin:keyWidth="20%p"
                    latin:keyEdgeFlags="right" />
            </Row>
        </default>
    </switch>
</Keyboard>
+4 −4
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@
            <key-style
                latin:styleName="numSpaceKeyStyle"
                latin:code="@integer/key_space"
                latin:iconPreview="@drawable/sym_keyboard_feedback_space"
                latin:keyIcon="@drawable/sym_keyboard_space" />
                latin:keyIcon="@drawable/sym_keyboard_space"
                latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
        </case>
        <case
            latin:colorScheme="black"
@@ -143,8 +143,8 @@
            <key-style
                latin:styleName="numSpaceKeyStyle"
                latin:code="@integer/key_space"
                latin:iconPreview="@drawable/sym_keyboard_feedback_space"
                latin:keyIcon="@drawable/sym_keyboard_space" />
                latin:keyIcon="@drawable/sym_bkeyboard_space"
                latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
        </case>
    </switch>
</merge>
+114 −74
Original line number Diff line number Diff line
@@ -31,27 +31,65 @@
>
    <include
        latin:keyboardLayout="@xml/kbd_key_styles" />
    <!-- TODO: Should add number password layout just like the xlarge layout does. -->
    <include
        latin:keyboardLayout="@xml/kbd_numkey_styles" />
    <switch>
        <case
            latin:colorScheme="white"
            latin:passwordInput="true"
        >
            <key-style
                latin:styleName="numSpaceKeyStyle"
                latin:code="@integer/key_space"
                latin:keyIcon="@drawable/sym_keyboard_space"
                latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
        </case>
        <case
            latin:colorScheme="black"
            <Row
                latin:rowEdgeFlags="top"
            >
            <key-style
                latin:styleName="numSpaceKeyStyle"
                latin:code="@integer/key_space"
                latin:keyIcon="@drawable/sym_bkeyboard_space"
                latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
                <Key
                    latin:keyStyle="num1KeyStyle"
                    latin:keyEdgeFlags="left" />
                <Key
                    latin:keyStyle="num2KeyStyle" />
                <Key
                    latin:keyStyle="num3KeyStyle" />
                <Spacer
                    latin:horizontalGap="20%p" />
            </Row>
            <Row>
                <Key
                    latin:keyStyle="num4KeyStyle"
                    latin:keyEdgeFlags="left" />
                <Key
                    latin:keyStyle="num5KeyStyle" />
                <Key
                    latin:keyStyle="num6KeyStyle" />
                <Spacer
                    latin:horizontalGap="20%p" />
            </Row>
            <Row>
                <Key
                    latin:keyStyle="num7KeyStyle"
                    latin:keyEdgeFlags="left" />
                <Key
                    latin:keyStyle="num8KeyStyle" />
                <Key
                    latin:keyStyle="num9KeyStyle" />
                <Key
                    latin:keyStyle="deleteKeyStyle"
                    latin:keyWidth="20%p"
                    latin:keyEdgeFlags="right" />
            </Row>
            <Row
                latin:rowEdgeFlags="bottom"
            >
                <Spacer
                    latin:horizontalGap="26.67%p" />
                <Key
                    latin:keyStyle="num0KeyStyle" />
                <Spacer
                    latin:horizontalGap="26.67%p" />
                <Key
                    latin:keyStyle="returnKeyStyle"
                    latin:keyWidth="20%p"
                    latin:keyEdgeFlags="right" />
            </Row>
        </case>
    </switch>
        <default>
            <Row
                latin:rowEdgeFlags="top"
            >
@@ -110,4 +148,6 @@
                    latin:keyWidth="20%p"
                    latin:keyEdgeFlags="right" />
            </Row>
        </default>
    </switch>
</Keyboard>