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

* commit 'eef3b7b328504d160bc4563e20025d2a86e21d38':
  Add number password keyboard layout to phone (DO NOT MERGE)
main
Tadashi G. Takaoka 2011-05-23 22:15:40 -07:00 committed by Android Git Automerger
commit 090c9f6ccc
3 changed files with 235 additions and 136 deletions

View File

@ -33,62 +33,121 @@
latin:keyboardLayout="@xml/kbd_key_styles" /> latin:keyboardLayout="@xml/kbd_key_styles" />
<include <include
latin:keyboardLayout="@xml/kbd_numkey_styles" /> latin:keyboardLayout="@xml/kbd_numkey_styles" />
<Row <switch>
latin:rowEdgeFlags="top" <case
> latin:passwordInput="true"
<Key >
latin:keyLabel="1" <Row
latin:keyEdgeFlags="left" /> latin:rowEdgeFlags="top"
<Key >
latin:keyLabel="2" /> <Key
<Key latin:keyStyle="num1KeyStyle"
latin:keyLabel="3" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="-" latin:keyStyle="num2KeyStyle" />
latin:keyStyle="functionalKeyStyle" <Key
latin:keyWidth="20%p" latin:keyStyle="num3KeyStyle" />
latin:keyEdgeFlags="right" /> <Spacer
</Row> latin:horizontalGap="20%p" />
<Row> </Row>
<Key <Row>
latin:keyLabel="4" <Key
latin:keyEdgeFlags="left" /> latin:keyStyle="num4KeyStyle"
<Key latin:keyEdgeFlags="left" />
latin:keyLabel="5" /> <Key
<Key latin:keyStyle="num5KeyStyle" />
latin:keyLabel="6" /> <Key
<Key latin:keyStyle="num6KeyStyle" />
latin:keyLabel="," <Spacer
latin:keyStyle="functionalKeyStyle" latin:horizontalGap="20%p" />
latin:keyWidth="20%p" </Row>
latin:keyEdgeFlags="right" /> <Row>
</Row> <Key
<Row> latin:keyStyle="num7KeyStyle"
<Key latin:keyEdgeFlags="left" />
latin:keyLabel="7" <Key
latin:keyEdgeFlags="left" /> latin:keyStyle="num8KeyStyle" />
<Key <Key
latin:keyLabel="8" /> latin:keyStyle="num9KeyStyle" />
<Key <Key
latin:keyLabel="9" /> latin:keyStyle="deleteKeyStyle"
<Key latin:keyWidth="20%p"
latin:keyStyle="deleteKeyStyle" latin:keyEdgeFlags="right" />
latin:keyWidth="20%p" </Row>
latin:keyEdgeFlags="right" /> <Row
</Row> latin:rowEdgeFlags="bottom"
<Row >
latin:rowEdgeFlags="bottom" <Spacer
> latin:horizontalGap="26.67%p" />
<Key <Key
latin:keyStyle="numSpaceKeyStyle" latin:keyStyle="num0KeyStyle" />
latin:keyEdgeFlags="left" /> <Spacer
<Key latin:horizontalGap="26.67%p" />
latin:keyLabel="0" /> <Key
<Key latin:keyStyle="returnKeyStyle"
latin:keyLabel="." /> latin:keyWidth="20%p"
<Key latin:keyEdgeFlags="right" />
latin:keyStyle="returnKeyStyle" </Row>
latin:keyWidth="20%p" </case>
latin:keyEdgeFlags="right" /> <default>
</Row> <Row
latin:rowEdgeFlags="top"
>
<Key
latin:keyLabel="1"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="2" />
<Key
latin:keyLabel="3" />
<Key
latin:keyLabel="-"
latin:keyStyle="functionalKeyStyle"
latin:keyWidth="20%p"
latin:keyEdgeFlags="right" />
</Row>
<Row>
<Key
latin:keyLabel="4"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="5" />
<Key
latin:keyLabel="6" />
<Key
latin:keyLabel=","
latin:keyStyle="functionalKeyStyle"
latin:keyWidth="20%p"
latin:keyEdgeFlags="right" />
</Row>
<Row>
<Key
latin:keyLabel="7"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="8" />
<Key
latin:keyLabel="9" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="20%p"
latin:keyEdgeFlags="right" />
</Row>
<Row
latin:rowEdgeFlags="bottom"
>
<Key
latin:keyStyle="numSpaceKeyStyle"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="0" />
<Key
latin:keyLabel="." />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="20%p"
latin:keyEdgeFlags="right" />
</Row>
</default>
</switch>
</Keyboard> </Keyboard>

View File

@ -81,8 +81,8 @@
<key-style <key-style
latin:styleName="numSpaceKeyStyle" latin:styleName="numSpaceKeyStyle"
latin:code="@integer/key_space" 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>
<case <case
latin:colorScheme="black" latin:colorScheme="black"
@ -143,8 +143,8 @@
<key-style <key-style
latin:styleName="numSpaceKeyStyle" latin:styleName="numSpaceKeyStyle"
latin:code="@integer/key_space" latin:code="@integer/key_space"
latin:iconPreview="@drawable/sym_keyboard_feedback_space" latin:keyIcon="@drawable/sym_bkeyboard_space"
latin:keyIcon="@drawable/sym_keyboard_space" /> latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
</case> </case>
</switch> </switch>
</merge> </merge>

View File

@ -31,83 +31,123 @@
> >
<include <include
latin:keyboardLayout="@xml/kbd_key_styles" /> 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> <switch>
<case <case
latin:colorScheme="white" latin:passwordInput="true"
> >
<key-style <Row
latin:styleName="numSpaceKeyStyle" latin:rowEdgeFlags="top"
latin:code="@integer/key_space" >
latin:keyIcon="@drawable/sym_keyboard_space" <Key
latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> latin:keyStyle="num1KeyStyle"
</case> latin:keyEdgeFlags="left" />
<case <Key
latin:colorScheme="black" latin:keyStyle="num2KeyStyle" />
> <Key
<key-style latin:keyStyle="num3KeyStyle" />
latin:styleName="numSpaceKeyStyle" <Spacer
latin:code="@integer/key_space" latin:horizontalGap="20%p" />
latin:keyIcon="@drawable/sym_bkeyboard_space" </Row>
latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> <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> </case>
<default>
<Row
latin:rowEdgeFlags="top"
>
<Key
latin:keyLabel="1"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="2" />
<Key
latin:keyLabel="3" />
<Key
latin:keyLabel="-"
latin:keyStyle="functionalKeyStyle"
latin:keyWidth="20%p"
latin:keyEdgeFlags="right" />
</Row>
<Row>
<Key
latin:keyLabel="4"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="5" />
<Key
latin:keyLabel="6" />
<Key
latin:keyLabel=","
latin:keyStyle="functionalKeyStyle"
latin:keyWidth="20%p"
latin:keyEdgeFlags="right" />
</Row>
<Row>
<Key
latin:keyLabel="7"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="8" />
<Key
latin:keyLabel="9" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="20%p"
latin:keyEdgeFlags="right" />
</Row>
<Row
latin:rowEdgeFlags="bottom"
>
<Key
latin:keyStyle="numSpaceKeyStyle"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="0" />
<Key
latin:keyLabel="." />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="20%p"
latin:keyEdgeFlags="right" />
</Row>
</default>
</switch> </switch>
<Row
latin:rowEdgeFlags="top"
>
<Key
latin:keyLabel="1"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="2" />
<Key
latin:keyLabel="3" />
<Key
latin:keyLabel="-"
latin:keyStyle="functionalKeyStyle"
latin:keyWidth="20%p"
latin:keyEdgeFlags="right" />
</Row>
<Row>
<Key
latin:keyLabel="4"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="5" />
<Key
latin:keyLabel="6" />
<Key
latin:keyLabel=","
latin:keyStyle="functionalKeyStyle"
latin:keyWidth="20%p"
latin:keyEdgeFlags="right" />
</Row>
<Row>
<Key
latin:keyLabel="7"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="8" />
<Key
latin:keyLabel="9" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="20%p"
latin:keyEdgeFlags="right" />
</Row>
<Row
latin:rowEdgeFlags="bottom"
>
<Key
latin:keyStyle="numSpaceKeyStyle"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="0" />
<Key
latin:keyLabel="." />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="20%p"
latin:keyEdgeFlags="right" />
</Row>
</Keyboard> </Keyboard>