am ec062159: Remove tab key from number/phone layout of 7 inch tablet

* commit 'ec062159707a5bf3d4145e49f0f3279cbcd727ab':
  Remove tab key from number/phone layout of 7 inch tablet
main
Tadashi G. Takaoka 2012-04-30 21:17:13 -07:00 committed by Android Git Automerger
commit 0f2b0b9e06
9 changed files with 52 additions and 66 deletions

View File

@ -21,7 +21,7 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyboardHorizontalEdgesPadding="10%p" latin:keyboardHorizontalEdgesPadding="10%p"
latin:keyWidth="15.00%p" latin:keyWidth="18%p"
> >
<include <include
latin:keyboardLayout="@xml/rows_number" /> latin:keyboardLayout="@xml/rows_number" />

View File

@ -21,7 +21,7 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyboardHorizontalEdgesPadding="10%p" latin:keyboardHorizontalEdgesPadding="10%p"
latin:keyWidth="15.00%p" latin:keyWidth="18%p"
> >
<include <include
latin:keyboardLayout="@xml/rows_phone" /> latin:keyboardLayout="@xml/rows_phone" />

View File

@ -21,7 +21,7 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyboardHorizontalEdgesPadding="10%p" latin:keyboardHorizontalEdgesPadding="10%p"
latin:keyWidth="15.00%p" latin:keyWidth="18%p"
> >
<!-- Tablet doesn't have phone symbols keyboard --> <!-- Tablet doesn't have phone symbols keyboard -->
<include <include

View File

@ -20,7 +20,7 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="15.00%p" latin:keyWidth="18%p"
> >
<include <include
latin:keyboardLayout="@xml/rows_number" /> latin:keyboardLayout="@xml/rows_number" />

View File

@ -20,7 +20,7 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="18.00%p" latin:keyWidth="18%p"
> >
<include <include
latin:keyboardLayout="@xml/rows_phone" /> latin:keyboardLayout="@xml/rows_phone" />

View File

@ -20,7 +20,7 @@
<Keyboard <Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:keyWidth="18.00%p" latin:keyWidth="18%p"
> >
<!-- Tablet doesn't have phone symbols keyboard --> <!-- Tablet doesn't have phone symbols keyboard -->
<include <include

View File

@ -22,25 +22,22 @@
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="12.75%p" />
<Key <Key
latin:keyLabel="-" latin:keyLabel="-"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" /> latin:keyWidth="10%p" />
<Key <Key
latin:keyLabel="+" latin:keyLabel="+"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" /> latin:keyWidth="10%p" />
<Key <Key
latin:keyLabel="." latin:keyLabel="."
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" /> latin:keyWidth="10%p" />
<Key <Key
latin:keyLabel="1" latin:keyLabel="1"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyXPos="42.25%p" /> latin:keyXPos="31%p" />
<Key <Key
latin:keyLabel="2" latin:keyLabel="2"
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numKeyStyle" />
@ -49,20 +46,17 @@
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numKeyStyle" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.00%p" latin:keyXPos="-14%p"
latin:keyWidth="fillRight" /> 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="12.75%p" />
<Key <Key
latin:keyStyle="numStarKeyStyle" latin:keyStyle="numStarKeyStyle"
latin:keyWidth="9.25%p" /> latin:keyWidth="10%p" />
<Key <Key
latin:keyLabel="/" latin:keyLabel="/"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" /> latin:keyWidth="10%p" />
<switch> <switch>
<case <case
latin:mode="time|datetime" latin:mode="time|datetime"
@ -72,19 +66,19 @@
latin:keyLabelFlags="hasPopupHint" latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_am_pm" latin:moreKeys="!text/more_keys_for_am_pm"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" /> latin:keyWidth="10%p" />
</case> </case>
<default> <default>
<Key <Key
latin:keyLabel="," latin:keyLabel=","
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" /> latin:keyWidth="10%p" />
</default> </default>
</switch> </switch>
<Key <Key
latin:keyLabel="4" latin:keyLabel="4"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyXPos="42.25%p" /> latin:keyXPos="31%p" />
<Key <Key
latin:keyLabel="5" latin:keyLabel="5"
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numKeyStyle" />
@ -93,21 +87,18 @@
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numKeyStyle" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyXPos="-11.00%p" latin:keyXPos="-14%p"
latin:keyWidth="fillRight" /> 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="12.75%p" />
<Key <Key
latin:keyLabel="(" latin:keyLabel="("
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" /> latin:keyWidth="10%p" />
<Key <Key
latin:keyLabel=")" latin:keyLabel=")"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" /> latin:keyWidth="10%p" />
<switch> <switch>
<case <case
latin:mode="time|datetime" latin:mode="time|datetime"
@ -115,19 +106,19 @@
<Key <Key
latin:keyLabel=":" latin:keyLabel=":"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" /> latin:keyWidth="10%p" />
</case> </case>
<default> <default>
<Key <Key
latin:keyLabel="=" latin:keyLabel="="
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" /> latin:keyWidth="10%p" />
</default> </default>
</switch> </switch>
<Key <Key
latin:keyLabel="7" latin:keyLabel="7"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyXPos="42.25%p" /> latin:keyXPos="31%p" />
<Key <Key
latin:keyLabel="8" latin:keyLabel="8"
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numKeyStyle" />
@ -138,16 +129,12 @@
<Spacer /> <Spacer />
</Row> </Row>
<Row> <Row>
<Key
latin:keyStyle="numTabKeyStyle"
latin:keyWidth="11.00%p" />
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="27.75%p" latin:keyWidth="30%p" />
latin:keyXPos="12.75%p" />
<Key <Key
latin:keyStyle="numStarKeyStyle" latin:keyStyle="numStarKeyStyle"
latin:keyXPos="42.25%p" /> latin:keyXPos="31%p" />
<Key <Key
latin:keyLabel="0" latin:keyLabel="0"
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numKeyStyle" />
@ -155,7 +142,7 @@
latin:keyLabel="#" latin:keyLabel="#"
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numKeyStyle" />
<include <include
latin:keyXPos="-11.0%p" latin:keyXPos="-10%p"
latin:keyWidth="fillRight" latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" /> latin:keyboardLayout="@xml/key_shortcut" />
</Row> </Row>

View File

@ -24,7 +24,7 @@
<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="27.50%p" /> latin:keyWidth="23%p" />
<Key <Key
latin:keyStyle="num1KeyStyle" /> latin:keyStyle="num1KeyStyle" />
<Key <Key
@ -33,13 +33,13 @@
latin:keyStyle="num3KeyStyle" /> latin:keyStyle="num3KeyStyle" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.00%p" latin:keyXPos="-16%p"
latin:keyWidth="fillRight" /> 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="27.50%p" /> latin:keyWidth="23%p" />
<Key <Key
latin:keyStyle="num4KeyStyle" /> latin:keyStyle="num4KeyStyle" />
<Key <Key
@ -48,13 +48,13 @@
latin:keyStyle="num6KeyStyle" /> latin:keyStyle="num6KeyStyle" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyXPos="-11.00%p" latin:keyXPos="-16%p"
latin:keyWidth="fillRight" /> 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="27.50%p" /> latin:keyWidth="23%p" />
<Key <Key
latin:keyStyle="num7KeyStyle" /> latin:keyStyle="num7KeyStyle" />
<Key <Key
@ -65,14 +65,13 @@
<Spacer /> <Spacer />
</Row> </Row>
<Row> <Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
latin:keyWidth="41%p" />
<Key <Key
latin:keyStyle="tabKeyStyle" latin:keyStyle="num0KeyStyle" />
latin:keyWidth="11.00%p" />
<Key
latin:keyStyle="num0KeyStyle"
latin:keyXPos="42.50%p"/>
<include <include
latin:keyXPos="-11.00%p" latin:keyXPos="-10%p"
latin:keyWidth="fillRight" latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" /> latin:keyboardLayout="@xml/key_shortcut" />
</Row> </Row>

View File

@ -29,66 +29,66 @@
<Key <Key
latin:keyLabel="-" latin:keyLabel="-"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10.00%p" /> latin:keyWidth="10%p" />
<Key <Key
latin:keyLabel="+" latin:keyLabel="+"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10.00%p" /> latin:keyWidth="10%p" />
<Key <Key
latin:keyStyle="numPauseKeyStyle" latin:keyStyle="numPauseKeyStyle"
latin:keyWidth="10.00%p" /> latin:keyWidth="10%p" />
<Key <Key
latin:keyStyle="num1KeyStyle" latin:keyStyle="num1KeyStyle"
latin:keyXPos="32.00%p" /> latin:keyXPos="31%p" />
<Key <Key
latin:keyStyle="num2KeyStyle" /> latin:keyStyle="num2KeyStyle" />
<Key <Key
latin:keyStyle="num3KeyStyle" /> latin:keyStyle="num3KeyStyle" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-12.00%p" latin:keyXPos="-14%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
<Key <Key
latin:keyLabel="," latin:keyLabel=","
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10.00%p" /> latin:keyWidth="10%p" />
<Key <Key
latin:keyLabel="." latin:keyLabel="."
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10.00%p" /> latin:keyWidth="10%p" />
<Key <Key
latin:keyStyle="numWaitKeyStyle" latin:keyStyle="numWaitKeyStyle"
latin:keyWidth="10.00%p" /> latin:keyWidth="10%p" />
<Key <Key
latin:keyStyle="num4KeyStyle" latin:keyStyle="num4KeyStyle"
latin:keyXPos="32.00%p" /> latin:keyXPos="31%p" />
<Key <Key
latin:keyStyle="num5KeyStyle" /> latin:keyStyle="num5KeyStyle" />
<Key <Key
latin:keyStyle="num6KeyStyle" /> latin:keyStyle="num6KeyStyle" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyXPos="-12.00%p" latin:keyXPos="-14%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
<Key <Key
latin:keyLabel="(" latin:keyLabel="("
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10.00%p" /> latin:keyWidth="10%p" />
<Key <Key
latin:keyLabel=")" latin:keyLabel=")"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10.00%p" /> latin:keyWidth="10%p" />
<Key <Key
latin:keyLabel="N" latin:keyLabel="N"
latin:keyStyle="numKeyStyle" latin:keyStyle="numKeyStyle"
latin:keyWidth="10.00%p" /> latin:keyWidth="10%p" />
<Key <Key
latin:keyStyle="num7KeyStyle" latin:keyStyle="num7KeyStyle"
latin:keyXPos="32.00%p" /> latin:keyXPos="31%p" />
<Key <Key
latin:keyStyle="num8KeyStyle" /> latin:keyStyle="num8KeyStyle" />
<Key <Key
@ -99,17 +99,17 @@
<Row> <Row>
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30.00%p" /> latin:keyWidth="30%p" />
<Key <Key
latin:keyStyle="numStarKeyStyle" latin:keyStyle="numStarKeyStyle"
latin:keyXPos="32.00%p" /> latin:keyXPos="31%p" />
<Key <Key
latin:keyStyle="num0KeyStyle" /> latin:keyStyle="num0KeyStyle" />
<Key <Key
latin:keyLabel="#" latin:keyLabel="#"
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numKeyStyle" />
<include <include
latin:keyXPos="-12.0%p" latin:keyXPos="-10%p"
latin:keyWidth="fillRight" latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" /> latin:keyboardLayout="@xml/key_shortcut" />
</Row> </Row>