Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
java/res/xml-sw600dp/rows_number_password.xml
+ 14
− 12
View file @ a1500959
...@@ -31,9 +31,8 @@ ...@@ -31,9 +31,8 @@
latin:keyStyle="num2KeyStyle" /> latin:keyStyle="num2KeyStyle" />
<Key <Key
latin:keyStyle="num3KeyStyle" /> latin:keyStyle="num3KeyStyle" />
<Key <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
latin:keyStyle="deleteKeyStyle" <Spacer
latin:keyXPos="-16%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
...@@ -46,9 +45,8 @@ ...@@ -46,9 +45,8 @@
latin:keyStyle="num5KeyStyle" /> latin:keyStyle="num5KeyStyle" />
<Key <Key
latin:keyStyle="num6KeyStyle" /> latin:keyStyle="num6KeyStyle" />
<Key <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
latin:keyStyle="enterKeyStyle" <Spacer
latin:keyXPos="-16%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
...@@ -62,17 +60,21 @@ ...@@ -62,17 +60,21 @@
<Key <Key
latin:keyStyle="num9KeyStyle" /> latin:keyStyle="num9KeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer /> <Spacer
latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer <Spacer
latin:keyWidth="41%p" /> latin:keyWidth="23%p" />
<Key
latin:keyStyle="deleteKeyStyle" />
<Key <Key
latin:keyStyle="num0KeyStyle" /> latin:keyStyle="num0KeyStyle" />
<include <Key
latin:keyXPos="-10%p" latin:keyStyle="enterKeyStyle" />
latin:keyWidth="fillRight" <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
latin:keyboardLayout="@xml/key_shortcut" /> <Spacer
latin:keyWidth="fillRight" />
</Row> </Row>
</merge> </merge>
java/res/xml/rows_number_password.xml
+ 25
− 7
View file @ a1500959
...@@ -22,41 +22,59 @@ ...@@ -22,41 +22,59 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
> >
<Row> <Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
latin:keyWidth="10%p" />
<Key <Key
latin:keyStyle="num1KeyStyle" /> latin:keyStyle="num1KeyStyle" />
<Key <Key
latin:keyStyle="num2KeyStyle" /> latin:keyStyle="num2KeyStyle" />
<Key <Key
latin:keyStyle="num3KeyStyle" /> 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>
<Row> <Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
latin:keyWidth="10%p" />
<Key <Key
latin:keyStyle="num4KeyStyle" /> latin:keyStyle="num4KeyStyle" />
<Key <Key
latin:keyStyle="num5KeyStyle" /> latin:keyStyle="num5KeyStyle" />
<Key <Key
latin:keyStyle="num6KeyStyle" /> 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>
<Row> <Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
latin:keyWidth="10%p" />
<Key <Key
latin:keyStyle="num7KeyStyle" /> latin:keyStyle="num7KeyStyle" />
<Key <Key
latin:keyStyle="num8KeyStyle" /> latin:keyStyle="num8KeyStyle" />
<Key <Key
latin:keyStyle="num9KeyStyle" /> latin:keyStyle="num9KeyStyle" />
<Key <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
latin:keyStyle="deleteKeyStyle" <Spacer
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<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 <Key
latin:keyStyle="num0KeyStyle" /> latin:keyStyle="num0KeyStyle" />
<Spacer />
<Key <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" /> latin:keyWidth="fillRight" />
</Row> </Row>
</merge> </merge>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment