nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revised phone/number layout for 7 inch tablet 

Bug: 4442045
Change-Id: I562d75436aec2057863f6a8252275a5e47ecea6e
main
Tadashi G. Takaoka 2011-06-01 16:16:57 +09:00
parent 528be97fca
commit 2f894882a8
18 changed files with 162 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
java/res/drawable-sw768dp-mdpi/sym_keyboard_tab_holo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 387 B

2
java/res/xml-sw600dp/kbd_azerty_rows.xml
View File

@ -105,7 +105,7 @@
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="11.1%p" latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="w" latin:keyLabel="w"

4
java/res/xml-sw600dp/kbd_key_styles.xml
View File

@ -167,8 +167,8 @@
<key-style <key-style
latin:styleName="tabKeyStyle" latin:styleName="tabKeyStyle"
latin:code="@integer/key_tab" latin:code="@integer/key_tab"
latin:keyLabel="@string/label_tab_key" latin:keyIcon="@drawable/sym_keyboard_tab_holo"
latin:keyLabelOption="fontNormal" latin:iconPreview="@drawable/sym_keyboard_tab_holo"
latin:parentStyle="functionalKeyStyle" /> latin:parentStyle="functionalKeyStyle" />
<key-style <key-style
latin:styleName="toSymbolKeyStyle" latin:styleName="toSymbolKeyStyle"

69
java/res/xml-sw600dp/kbd_number.xml
View File

@ -23,7 +23,7 @@
latin:keyboardHeight="@dimen/keyboardHeight" latin:keyboardHeight="@dimen/keyboardHeight"
latin:maxKeyboardHeight="50%p" latin:maxKeyboardHeight="50%p"
latin:rowHeight="25%p" latin:rowHeight="25%p"
latin:keyWidth="12.7%p" latin:keyWidth="16.75%p"
latin:horizontalGap="@dimen/key_horizontal_gap" latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap" latin:verticalGap="@dimen/key_bottom_gap"
latin:popupKeyboardTemplate="@xml/kbd_popup_template" latin:popupKeyboardTemplate="@xml/kbd_popup_template"
@ -41,35 +41,35 @@
<Row> <Row>
<Key <Key
latin:keyStyle="num1KeyStyle" latin:keyStyle="num1KeyStyle"
latin:keyXPos="29.5%p" /> latin:keyXPos="24.875%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="-10.0%p" latin:keyXPos="-11.0%p"
latin:keyWidth="0%p" latin:keyWidth="0%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row>
<Key <Key
latin:keyStyle="num4KeyStyle" latin:keyStyle="num4KeyStyle"
latin:keyXPos="29.5%p" /> latin:keyXPos="24.875%p" />
<Key <Key
latin:keyStyle="num5KeyStyle" /> latin:keyStyle="num5KeyStyle" />
<Key <Key
latin:keyStyle="num6KeyStyle" /> latin:keyStyle="num6KeyStyle" />
<Key <Key
latin:keyStyle="returnKeyStyle" latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p" latin:keyXPos="-11.0%p"
latin:keyWidth="0%p" latin:keyWidth="0%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row>
<Key <Key
latin:keyStyle="num7KeyStyle" latin:keyStyle="num7KeyStyle"
latin:keyXPos="29.5%p" /> latin:keyXPos="24.875%p" />
<Key <Key
latin:keyStyle="num8KeyStyle" /> latin:keyStyle="num8KeyStyle" />
<Key <Key
@ -79,17 +79,17 @@
<Row> <Row>
<Key <Key
latin:keyStyle="tabKeyStyle" latin:keyStyle="tabKeyStyle"
latin:keyWidth="10.0%p" latin:keyWidth="11.0%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Spacer <Spacer
latin:keyXPos="29.5%p" /> latin:keyXPos="24.875%p" />
<Key <Key
latin:keyStyle="num0KeyStyle" /> latin:keyStyle="num0KeyStyle" />
<Spacer /> <Spacer />
<Key <Key
latin:keyStyle="micOrSettingsKeyStyle" latin:keyStyle="micOrSettingsKeyStyle"
latin:keyXPos="-10.0%p" latin:keyXPos="-11.00%p"
latin:keyWidth="0.0%p" latin:keyWidth="0%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
</case> </case>
@ -99,49 +99,49 @@
<Row> <Row>
<Key <Key
latin:keyLabel="-" latin:keyLabel="-"
latin:keyXPos="14.5%p" latin:keyXPos="11.0%p"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyLabel="+" latin:keyLabel="+"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyLabel="." latin:keyLabel="."
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyLabel="1" latin:keyLabel="1"
latin:keyXPos="43.3%p" /> latin:keyXPos="38.75%p" />
<Key <Key
latin:keyLabel="2" /> latin:keyLabel="2" />
<Key <Key
latin:keyLabel="3" /> latin:keyLabel="3" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p" latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" latin:keyWidth="-11.00%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row>
<Key <Key
latin:keyLabel="*" latin:keyLabel="*"
latin:keyXPos="14.5%p" latin:keyXPos="11.0%p"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyLabel="/" latin:keyLabel="/"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyLabel="," latin:keyLabel=","
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyLabel="4" latin:keyLabel="4"
latin:keyXPos="43.3%p" /> latin:keyXPos="38.75%p" />
<Key <Key
latin:keyLabel="5" /> latin:keyLabel="5" />
<Key <Key
latin:keyLabel="6" /> latin:keyLabel="6" />
<Key <Key
latin:keyStyle="returnKeyStyle" latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p" latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" latin:keyWidth="-11.00%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row>
@ -150,17 +150,17 @@
edge key. --> edge key. -->
<Key <Key
latin:keyLabel="(" latin:keyLabel="("
latin:keyXPos="14.5%p" latin:keyXPos="11.0%p"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyLabel=")" latin:keyLabel=")"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyLabel="=" latin:keyLabel="="
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyLabel="7" latin:keyLabel="7"
latin:keyXPos="43.3%p" /> latin:keyXPos="38.75%p" />
<Key <Key
latin:keyLabel="8" /> latin:keyLabel="8" />
<Key <Key
@ -170,23 +170,22 @@
<Row> <Row>
<Key <Key
latin:keyStyle="tabKeyStyle" latin:keyStyle="tabKeyStyle"
latin:keyWidth="10.0%p" latin:keyWidth="11.00%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
latin:keyXPos="14.5%p" latin:keyWidth="27.75%p" />
latin:keyWidth="27.2%p" />
<Key <Key
latin:keyLabel="*" latin:keyLabel="*"
latin:keyXPos="43.3%p" /> latin:keyXPos="38.75%p" />
<Key <Key
latin:keyLabel="0" /> latin:keyLabel="0" />
<Key <Key
latin:keyLabel="#" /> latin:keyLabel="#" />
<Key <Key
latin:keyStyle="micOrSettingsKeyStyle" latin:keyStyle="micOrSettingsKeyStyle"
latin:keyXPos="-10.0%p" latin:keyXPos="-11.00%p"
latin:keyWidth="0.0%p" latin:keyWidth="-11.00%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
</default> </default>

48
java/res/xml-sw600dp/kbd_phone.xml
View File

@ -23,7 +23,7 @@
latin:keyboardHeight="@dimen/keyboardHeight" latin:keyboardHeight="@dimen/keyboardHeight"
latin:maxKeyboardHeight="50%p" latin:maxKeyboardHeight="50%p"
latin:rowHeight="25%p" latin:rowHeight="25%p"
latin:keyWidth="12.7%p" latin:keyWidth="16.75%p"
latin:horizontalGap="@dimen/key_horizontal_gap" latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap" latin:verticalGap="@dimen/key_bottom_gap"
latin:popupKeyboardTemplate="@xml/kbd_popup_template" latin:popupKeyboardTemplate="@xml/kbd_popup_template"
@ -38,67 +38,67 @@
<Key <Key
latin:code="45" latin:code="45"
latin:keyLabel=" - " latin:keyLabel=" - "
latin:keyXPos="19.0%p" latin:keyXPos="15.625%p"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:code="43" latin:code="43"
latin:keyLabel=" + " latin:keyLabel=" + "
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyStyle="num1KeyStyle" latin:keyStyle="num1KeyStyle"
latin:keyXPos="43.3%p" /> latin:keyXPos="38.867%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="-10.0%p" latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" latin:keyWidth="-11.00%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row>
<Key <Key
latin:code="44" latin:code="44"
latin:keyLabel=" , " latin:keyLabel=" , "
latin:keyXPos="19.0%p" latin:keyXPos="15.625%p"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:code="46" latin:code="46"
latin:keyLabel=" . " latin:keyLabel=" . "
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyStyle="num4KeyStyle" latin:keyStyle="num4KeyStyle"
latin:keyXPos="43.3%p" /> latin:keyXPos="38.867%p" />
<Key <Key
latin:keyStyle="num5KeyStyle" /> latin:keyStyle="num5KeyStyle" />
<Key <Key
latin:keyStyle="num6KeyStyle" /> latin:keyStyle="num6KeyStyle" />
<Key <Key
latin:keyStyle="returnKeyStyle" latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p" latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" latin:keyWidth="-11.00%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row>
<Key <Key
latin:keyStyle="moreKeyStyle" latin:keyStyle="moreKeyStyle"
latin:keyWidth="10.0%p" latin:keyWidth="11.00%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<!-- There is an empty area below the "More" key and left of the "(" key. To ignore <!-- There is an empty area below the "More" key and left of the "(" key. To ignore
the touch event on the area, "(" is intentionally not marked as a left edge key. --> the touch event on the area, "(" is intentionally not marked as a left edge key. -->
<Key <Key
latin:code="40" latin:code="40"
latin:keyLabel=" ( " latin:keyLabel=" ( "
latin:keyXPos="19.0%p" latin:keyXPos="15.625%p"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:code="41" latin:code="41"
latin:keyLabel=" ) " latin:keyLabel=" ) "
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyStyle="num7KeyStyle" latin:keyStyle="num7KeyStyle"
latin:keyXPos="43.3%p" /> latin:keyXPos="38.867%p" />
<Key <Key
latin:keyStyle="num8KeyStyle" /> latin:keyStyle="num8KeyStyle" />
<Key <Key
@ -108,23 +108,23 @@
<Row> <Row>
<Key <Key
latin:keyStyle="tabKeyStyle" latin:keyStyle="tabKeyStyle"
latin:keyWidth="10.0%p" latin:keyWidth="11.00%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
latin:keyXPos="19.0%p" latin:keyXPos="15.625%p"
latin:keyWidth="18.2%p" /> latin:keyWidth="18.67%p" />
<Key <Key
latin:keyStyle="numStarKeyStyle" latin:keyStyle="numStarKeyStyle"
latin:keyXPos="43.3%p" /> latin:keyXPos="38.867%p" />
<Key <Key
latin:keyStyle="num0KeyStyle" /> latin:keyStyle="num0KeyStyle" />
<Key <Key
latin:keyStyle="numPoundKeyStyle" /> latin:keyStyle="numPoundKeyStyle" />
<Key <Key
latin:keyStyle="micOrSettingsKeyStyle" latin:keyStyle="micOrSettingsKeyStyle"
latin:keyXPos="-10.0%p" latin:keyXPos="-11.00%p"
latin:keyWidth="0.0%p" latin:keyWidth="-11.00%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
</Keyboard> </Keyboard>

52
java/res/xml-sw600dp/kbd_phone_symbols.xml
View File

@ -23,7 +23,7 @@
latin:keyboardHeight="@dimen/keyboardHeight" latin:keyboardHeight="@dimen/keyboardHeight"
latin:maxKeyboardHeight="50%p" latin:maxKeyboardHeight="50%p"
latin:rowHeight="25%p" latin:rowHeight="25%p"
latin:keyWidth="12.7%p" latin:keyWidth="16.75%p"
latin:horizontalGap="@dimen/key_horizontal_gap" latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap" latin:verticalGap="@dimen/key_bottom_gap"
latin:popupKeyboardTemplate="@xml/kbd_popup_template" latin:popupKeyboardTemplate="@xml/kbd_popup_template"
@ -38,79 +38,78 @@
<Key <Key
latin:code="45" latin:code="45"
latin:keyLabel=" - " latin:keyLabel=" - "
latin:keyXPos="14.5%p" latin:keyXPos="11.0%p"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:code="43" latin:code="43"
latin:keyLabel=" + " latin:keyLabel=" + "
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:code="44" latin:code="44"
latin:keyLabel="@string/label_pause_key" latin:keyLabel="@string/label_pause_key"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyStyle="num1KeyStyle" latin:keyStyle="num1KeyStyle"
latin:keyXPos="43.3%p" /> latin:keyXPos="38.867%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="-10.0%p" latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" latin:keyWidth="-11.00%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row>
<Key <Key
latin:code="44" latin:code="44"
latin:keyLabel=" , " latin:keyLabel=" , "
latin:keyXPos="14.5%p" latin:keyXPos="11.0%p"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:code="46" latin:code="46"
latin:keyLabel=" . " latin:keyLabel=" . "
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:code="59" latin:code="59"
latin:keyLabel="@string/label_wait_key" latin:keyLabel="@string/label_wait_key"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyStyle="num4KeyStyle" latin:keyStyle="num4KeyStyle"
latin:keyXPos="43.3%p" /> latin:keyXPos="38.867%p" />
<Key <Key
latin:keyStyle="num5KeyStyle" /> latin:keyStyle="num5KeyStyle" />
<Key <Key
latin:keyStyle="num6KeyStyle" /> latin:keyStyle="num6KeyStyle" />
<Key <Key
latin:keyStyle="returnKeyStyle" latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p" latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" latin:keyWidth="-11.00%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row>
<Key <Key
latin:keyStyle="moreKeyStyle" latin:keyStyle="moreKeyStyle"
latin:keyWidth="10.0%p" latin:keyWidth="11.00%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<!-- There is an empty area below the "More" key and left of the "(" key. To ignore <!-- There is an empty area below the "More" key and left of the "(" key. To ignore
the touch event on the area, "(" is intentionally not marked as a left edge key. --> the touch event on the area, "(" is intentionally not marked as a left edge key. -->
<Key <Key
latin:code="40" latin:code="40"
latin:keyLabel=" ( " latin:keyLabel=" ( "
latin:keyXPos="14.5%p" latin:keyWidth="9.25%p" />
latin:keyWidth="9.1%p" />
<Key <Key
latin:code="41" latin:code="41"
latin:keyLabel=" ) " latin:keyLabel=" ) "
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:code="78" latin:code="78"
latin:keyLabel=" N " latin:keyLabel=" N "
latin:keyWidth="9.1%p" /> latin:keyWidth="9.25%p" />
<Key <Key
latin:keyStyle="num7KeyStyle" latin:keyStyle="num7KeyStyle"
latin:keyXPos="43.3%p" /> latin:keyXPos="38.867%p" />
<Key <Key
latin:keyStyle="num8KeyStyle" /> latin:keyStyle="num8KeyStyle" />
<Key <Key
@ -120,23 +119,22 @@
<Row> <Row>
<Key <Key
latin:keyStyle="tabKeyStyle" latin:keyStyle="tabKeyStyle"
latin:keyWidth="10.0%p" latin:keyWidth="11.00%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
latin:keyXPos="14.5%p" latin:keyWidth="27.75%p" />
latin:keyWidth="27.2%p" />
<Key <Key
latin:keyStyle="numStarKeyStyle" latin:keyStyle="numStarKeyStyle"
latin:keyXPos="43.3%p" /> latin:keyXPos="38.867%p" />
<Key <Key
latin:keyStyle="num0KeyStyle" /> latin:keyStyle="num0KeyStyle" />
<Key <Key
latin:keyStyle="numPoundKeyStyle" /> latin:keyStyle="numPoundKeyStyle" />
<Key <Key
latin:keyStyle="micOrSettingsKeyStyle" latin:keyStyle="micOrSettingsKeyStyle"
latin:keyXPos="-10.0%p" latin:keyXPos="-11.00%p"
latin:keyWidth="0.0%p" latin:keyWidth="-11.00%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
</Keyboard> </Keyboard>

2
java/res/xml-sw600dp/kbd_qwerty_row3.xml
View File

@ -26,7 +26,7 @@
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="11.1%p" latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="z" latin:keyLabel="z"

50
java/res/xml-sw600dp/kbd_qwerty_row4.xml
View File

@ -23,7 +23,7 @@
> >
<!-- This row is intentionally not marked as a bottom row --> <!-- This row is intentionally not marked as a bottom row -->
<Row <Row
latin:keyWidth="9.1%p" latin:keyWidth="8.9%p"
> >
<Key <Key
latin:keyStyle="toSymbolKeyStyle" latin:keyStyle="toSymbolKeyStyle"
@ -31,22 +31,19 @@
latin:keyWidth="13.0%p" latin:keyWidth="13.0%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyStyle="tabKeyStyle" latin:keyStyle="tabKeyStyle" />
latin:keyWidth="8.9%p" />
<switch> <switch>
<case <case
latin:mode="email" latin:mode="email"
> >
<Key <Key
latin:keyStyle="comKeyStyle" latin:keyStyle="comKeyStyle" />
latin:keyWidth="8.9%p" />
</case> </case>
<case <case
latin:mode="url" latin:mode="url"
> >
<Key <Key
latin:keyStyle="comKeyStyle" latin:keyStyle="comKeyStyle" />
latin:keyWidth="8.9%p" />
</case> </case>
<default> <default>
<Key <Key
@ -54,14 +51,13 @@
latin:manualTemporaryUpperCaseCode="64" latin:manualTemporaryUpperCaseCode="64"
latin:keyHintIcon="@drawable/key_hint_at_holo" latin:keyHintIcon="@drawable/key_hint_at_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo"
latin:popupCharacters="\@" latin:popupCharacters="\@" />
latin:keyWidth="8.9%p" />
</default> </default>
</switch> </switch>
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyXPos="30.8%p" latin:keyXPos="30.750%p"
latin:keyWidth="41.0%p" /> latin:keyWidth="39.750%p" />
<switch> <switch>
<case <case
latin:languageCode="ru" latin:languageCode="ru"
@ -71,7 +67,8 @@
latin:mode="email" latin:mode="email"
> >
<Key <Key
latin:keyLabel="-" /> latin:keyLabel="-"
latin:keyWidth="9.750%p" />
</case> </case>
<case <case
latin:mode="url" latin:mode="url"
@ -81,7 +78,8 @@
latin:manualTemporaryUpperCaseCode="58" latin:manualTemporaryUpperCaseCode="58"
latin:keyHintIcon="@drawable/key_hint_colon_holo" latin:keyHintIcon="@drawable/key_hint_colon_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo"
latin:popupCharacters=":" /> latin:popupCharacters=":"
latin:keyWidth="9.750%p" />
</case> </case>
<default> <default>
<Key <Key
@ -89,7 +87,8 @@
latin:manualTemporaryUpperCaseCode="95" latin:manualTemporaryUpperCaseCode="95"
latin:keyHintIcon="@drawable/key_hint_underline_holo" latin:keyHintIcon="@drawable/key_hint_underline_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo"
latin:popupCharacters="_" /> latin:popupCharacters="_"
latin:keyWidth="9.750%p" />
</default> </default>
</switch> </switch>
<switch> <switch>
@ -97,7 +96,8 @@
latin:mode="email" latin:mode="email"
> >
<Key <Key
latin:keyLabel="_" /> latin:keyLabel="_"
latin:keyWidth="9.750%p" />
</case> </case>
<default> <default>
<Key <Key
@ -105,7 +105,8 @@
latin:manualTemporaryUpperCaseCode="39" latin:manualTemporaryUpperCaseCode="39"
latin:keyHintIcon="@drawable/key_hint_quote_holo" latin:keyHintIcon="@drawable/key_hint_quote_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo"
latin:popupCharacters="\'" /> latin:popupCharacters="\'"
latin:keyWidth="9.750%p" />
</default> </default>
</switch> </switch>
</case> </case>
@ -116,7 +117,8 @@
latin:mode="email" latin:mode="email"
> >
<Key <Key
latin:keyLabel="-" /> latin:keyLabel="-"
latin:keyWidth="9.750%p" />
</case> </case>
<case <case
latin:mode="url" latin:mode="url"
@ -126,7 +128,8 @@
latin:manualTemporaryUpperCaseCode="58" latin:manualTemporaryUpperCaseCode="58"
latin:keyHintIcon="@drawable/key_hint_colon_holo" latin:keyHintIcon="@drawable/key_hint_colon_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo"
latin:popupCharacters=":" /> latin:popupCharacters=":"
latin:keyWidth="9.750%p" />
</case> </case>
<default> <default>
<Key <Key
@ -134,7 +137,8 @@
latin:manualTemporaryUpperCaseCode="34" latin:manualTemporaryUpperCaseCode="34"
latin:keyHintIcon="@drawable/key_hint_quote_holo" latin:keyHintIcon="@drawable/key_hint_quote_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo"
latin:popupCharacters="&quot;" /> latin:popupCharacters="&quot;"
latin:keyWidth="9.750%p" />
</default> </default>
</switch> </switch>
<switch> <switch>
@ -142,7 +146,8 @@
latin:mode="email" latin:mode="email"
> >
<Key <Key
latin:keyLabel="_" /> latin:keyLabel="_"
latin:keyWidth="9.750%p" />
</case> </case>
<default> <default>
<Key <Key
@ -150,7 +155,8 @@
latin:manualTemporaryUpperCaseCode="95" latin:manualTemporaryUpperCaseCode="95"
latin:keyHintIcon="@drawable/key_hint_underline_holo" latin:keyHintIcon="@drawable/key_hint_underline_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo" latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo"
latin:popupCharacters="_" /> latin:popupCharacters="_"
latin:keyWidth="9.750%p" />
</default> </default>
</switch> </switch>
</default> </default>
@ -158,7 +164,7 @@
<Key <Key
latin:keyStyle="micOrSettingsKeyStyle" latin:keyStyle="micOrSettingsKeyStyle"
latin:keyXPos="-10.0%p" latin:keyXPos="-10.0%p"
latin:keyWidth="-10.0%p" latin:keyWidth="0%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
</merge> </merge>

2
java/res/xml-sw600dp/kbd_qwertz_rows.xml
View File

@ -71,7 +71,7 @@
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="11.1%p" latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="y" latin:keyLabel="y"

2
java/res/xml-sw600dp/kbd_ru_rows.xml
View File

@ -95,7 +95,7 @@
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="11.1%p" latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="я" /> latin:keyLabel="я" />

2
java/res/xml-sw600dp/kbd_sr_rows.xml
View File

@ -94,7 +94,7 @@
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="8.8%p" latin:keyWidth="8.0%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="ѕ" /> latin:keyLabel="ѕ" />

16
java/res/xml-sw600dp/kbd_symbols.xml
View File

@ -108,7 +108,7 @@
> >
<Key <Key
latin:keyStyle="moreKeyStyle" latin:keyStyle="moreKeyStyle"
latin:keyWidth="11.1%p" latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="&lt;" latin:keyLabel="&lt;"
@ -190,18 +190,18 @@
latin:keyLabel="\@" /> latin:keyLabel="\@" />
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyXPos="30.8%p" latin:keyXPos="30.750%p"
latin:keyWidth="41.0%p" /> latin:keyWidth="39.750%p" />
<switch> <switch>
<case <case
latin:languageCode="ru" latin:languageCode="ru"
> >
<Key <Key
latin:keyLabel="_" latin:keyLabel="_"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.750%p" />
<Key <Key
latin:keyLabel="-" latin:keyLabel="-"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.750%p" />
</case> </case>
<default> <default>
<!-- Note: DroidSans doesn't have double-high-reversed-quotation <!-- Note: DroidSans doesn't have double-high-reversed-quotation
@ -210,16 +210,16 @@
<Key <Key
latin:keyLabel="&quot;" latin:keyLabel="&quot;"
latin:popupCharacters="“,”,«,»,‘,’,‚,‛" latin:popupCharacters="“,”,«,»,‘,’,‚,‛"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.750%p" />
<Key <Key
latin:keyLabel="_" latin:keyLabel="_"
latin:keyWidth="9.1%p" /> latin:keyWidth="9.750%p" />
</default> </default>
</switch> </switch>
<Key <Key
latin:keyStyle="micOrSettingsKeyStyle" latin:keyStyle="micOrSettingsKeyStyle"
latin:keyXPos="-10.0%p" latin:keyXPos="-10.0%p"
latin:keyWidth="-10.0%p" latin:keyWidth="0%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
</Keyboard> </Keyboard>

6
java/res/xml-sw600dp/kbd_symbols_shift.xml
View File

@ -112,7 +112,7 @@
> >
<Key <Key
latin:keyStyle="moreKeyStyle" latin:keyStyle="moreKeyStyle"
latin:keyWidth="11.1%p" latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="\\" /> latin:keyLabel="\\" />
@ -152,8 +152,8 @@
latin:keyStyle="tabKeyStyle" /> latin:keyStyle="tabKeyStyle" />
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyXPos="30.8%p" latin:keyXPos="30.750%p"
latin:keyWidth="41.0%p" /> latin:keyWidth="39.750%p" />
<Key <Key
latin:keyStyle="micOrSettingsKeyStyle" latin:keyStyle="micOrSettingsKeyStyle"
latin:keyXPos="-10.0%p" latin:keyXPos="-10.0%p"

22
java/res/xml-sw768dp/kbd_number.xml
View File

@ -23,7 +23,7 @@
latin:keyboardHeight="@dimen/keyboardHeight" latin:keyboardHeight="@dimen/keyboardHeight"
latin:maxKeyboardHeight="50%p" latin:maxKeyboardHeight="50%p"
latin:rowHeight="25%p" latin:rowHeight="25%p"
latin:keyWidth="11.954%p" latin:keyWidth="13.250%p"
latin:horizontalGap="@dimen/key_horizontal_gap" latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap" latin:verticalGap="@dimen/key_bottom_gap"
latin:popupKeyboardTemplate="@xml/kbd_popup_template" latin:popupKeyboardTemplate="@xml/kbd_popup_template"
@ -42,7 +42,7 @@
<Key <Key
latin:keyStyle="tabKeyStyle" latin:keyStyle="tabKeyStyle"
latin:keyLabelOption="alignLeft" latin:keyLabelOption="alignLeft"
latin:keyWidth="7.969%p" latin:keyWidth="11.172%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyStyle="num1KeyStyle" latin:keyStyle="num1KeyStyle"
@ -53,7 +53,7 @@
latin:keyStyle="num3KeyStyle" /> latin:keyStyle="num3KeyStyle" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p" latin:keyXPos="-11.172%p"
latin:keyWidth="0%p" latin:keyWidth="0%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
@ -67,7 +67,7 @@
latin:keyStyle="num6KeyStyle" /> latin:keyStyle="num6KeyStyle" />
<Key <Key
latin:keyStyle="returnKeyStyle" latin:keyStyle="returnKeyStyle"
latin:keyXPos="-15.704%p" latin:keyXPos="-11.172%p"
latin:keyWidth="0%p" latin:keyWidth="0%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
@ -101,7 +101,7 @@
<Key <Key
latin:keyStyle="tabKeyStyle" latin:keyStyle="tabKeyStyle"
latin:keyLabelOption="alignLeft" latin:keyLabelOption="alignLeft"
latin:keyWidth="7.969%p" latin:keyWidth="11.172%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="-" latin:keyLabel="-"
@ -115,14 +115,14 @@
latin:keyWidth="8.047%p" /> latin:keyWidth="8.047%p" />
<Key <Key
latin:keyLabel="1" latin:keyLabel="1"
latin:keyXPos="45.0%p" /> latin:keyXPos="43.125%p" />
<Key <Key
latin:keyLabel="2" /> latin:keyLabel="2" />
<Key <Key
latin:keyLabel="3" /> latin:keyLabel="3" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p" latin:keyXPos="-11.172%p"
latin:keyWidth="0%p" latin:keyWidth="0%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
@ -139,14 +139,14 @@
latin:keyWidth="8.047%p" /> latin:keyWidth="8.047%p" />
<Key <Key
latin:keyLabel="4" latin:keyLabel="4"
latin:keyXPos="45.0%p" /> latin:keyXPos="43.125%p" />
<Key <Key
latin:keyLabel="5" /> latin:keyLabel="5" />
<Key <Key
latin:keyLabel="6" /> latin:keyLabel="6" />
<Key <Key
latin:keyStyle="returnKeyStyle" latin:keyStyle="returnKeyStyle"
latin:keyXPos="-15.704%p" latin:keyXPos="-11.172%p"
latin:keyWidth="0%p" latin:keyWidth="0%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
@ -166,7 +166,7 @@
latin:keyWidth="8.047%p" /> latin:keyWidth="8.047%p" />
<Key <Key
latin:keyLabel="7" latin:keyLabel="7"
latin:keyXPos="45.0%p" /> latin:keyXPos="43.125%p" />
<Key <Key
latin:keyLabel="8" /> latin:keyLabel="8" />
<Key <Key
@ -194,7 +194,7 @@
latin:keyWidth="24.14%p" /> latin:keyWidth="24.14%p" />
<Key <Key
latin:keyLabel="*" latin:keyLabel="*"
latin:keyXPos="45.0%p" /> latin:keyXPos="43.125%p" />
<Key <Key
latin:keyLabel="0" /> latin:keyLabel="0" />
<Key <Key

16
java/res/xml-sw768dp/kbd_phone.xml
View File

@ -23,7 +23,7 @@
latin:keyboardHeight="@dimen/keyboardHeight" latin:keyboardHeight="@dimen/keyboardHeight"
latin:maxKeyboardHeight="50%p" latin:maxKeyboardHeight="50%p"
latin:rowHeight="25%p" latin:rowHeight="25%p"
latin:keyWidth="11.954%p" latin:keyWidth="13.250%p"
latin:horizontalGap="@dimen/key_horizontal_gap" latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap" latin:verticalGap="@dimen/key_bottom_gap"
latin:popupKeyboardTemplate="@xml/kbd_popup_template" latin:popupKeyboardTemplate="@xml/kbd_popup_template"
@ -38,7 +38,7 @@
<Key <Key
latin:keyStyle="tabKeyStyle" latin:keyStyle="tabKeyStyle"
latin:keyLabelOption="alignLeft" latin:keyLabelOption="alignLeft"
latin:keyWidth="7.969%p" latin:keyWidth="11.172%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<!-- To match one character label size with "Tab", I placed spaces around the char '-' <!-- To match one character label size with "Tab", I placed spaces around the char '-'
and '+'. --> and '+'. -->
@ -53,14 +53,14 @@
latin:keyWidth="8.047%p" /> latin:keyWidth="8.047%p" />
<Key <Key
latin:keyStyle="num1KeyStyle" latin:keyStyle="num1KeyStyle"
latin:keyXPos="45.0%p" /> latin:keyXPos="43.125%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="-9.219%p" latin:keyXPos="-11.172%p"
latin:keyWidth="0%p" latin:keyWidth="0%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
@ -82,14 +82,14 @@
latin:keyWidth="8.047%p" /> latin:keyWidth="8.047%p" />
<Key <Key
latin:keyStyle="num4KeyStyle" latin:keyStyle="num4KeyStyle"
latin:keyXPos="45.0%p" /> latin:keyXPos="43.125%p" />
<Key <Key
latin:keyStyle="num5KeyStyle" /> latin:keyStyle="num5KeyStyle" />
<Key <Key
latin:keyStyle="num6KeyStyle" /> latin:keyStyle="num6KeyStyle" />
<Key <Key
latin:keyStyle="returnKeyStyle" latin:keyStyle="returnKeyStyle"
latin:keyXPos="-15.704%p" latin:keyXPos="-11.172%p"
latin:keyWidth="0%p" latin:keyWidth="0%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
@ -109,7 +109,7 @@
latin:keyWidth="8.047%p" /> latin:keyWidth="8.047%p" />
<Key <Key
latin:keyStyle="num7KeyStyle" latin:keyStyle="num7KeyStyle"
latin:keyXPos="45.0%p" /> latin:keyXPos="43.125%p" />
<Key <Key
latin:keyStyle="num8KeyStyle" /> latin:keyStyle="num8KeyStyle" />
<Key <Key
@ -136,7 +136,7 @@
latin:keyWidth="16.084%p" /> latin:keyWidth="16.084%p" />
<Key <Key
latin:keyStyle="numStarKeyStyle" latin:keyStyle="numStarKeyStyle"
latin:keyXPos="45.0%p" /> latin:keyXPos="43.125%p" />
<Key <Key
latin:keyStyle="num0KeyStyle" /> latin:keyStyle="num0KeyStyle" />
<Key <Key

16
java/res/xml-sw768dp/kbd_phone_symbols.xml
View File

@ -23,7 +23,7 @@
latin:keyboardHeight="@dimen/keyboardHeight" latin:keyboardHeight="@dimen/keyboardHeight"
latin:maxKeyboardHeight="50%p" latin:maxKeyboardHeight="50%p"
latin:rowHeight="25%p" latin:rowHeight="25%p"
latin:keyWidth="11.954%p" latin:keyWidth="13.250%p"
latin:horizontalGap="@dimen/key_horizontal_gap" latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap" latin:verticalGap="@dimen/key_bottom_gap"
latin:popupKeyboardTemplate="@xml/kbd_popup_template" latin:popupKeyboardTemplate="@xml/kbd_popup_template"
@ -38,7 +38,7 @@
<Key <Key
latin:keyStyle="tabKeyStyle" latin:keyStyle="tabKeyStyle"
latin:keyLabelOption="alignLeft" latin:keyLabelOption="alignLeft"
latin:keyWidth="7.969%p" latin:keyWidth="11.172%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:code="45" latin:code="45"
@ -57,14 +57,14 @@
char '-' and '+'. --> char '-' and '+'. -->
<Key <Key
latin:keyStyle="num1KeyStyle" latin:keyStyle="num1KeyStyle"
latin:keyXPos="45.0%p" /> latin:keyXPos="43.125%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="-9.219%p" latin:keyXPos="-11.172%p"
latin:keyWidth="0%p" latin:keyWidth="0%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
@ -90,14 +90,14 @@
char ',' and '.'. --> char ',' and '.'. -->
<Key <Key
latin:keyStyle="num4KeyStyle" latin:keyStyle="num4KeyStyle"
latin:keyXPos="45.0%p" /> latin:keyXPos="43.125%p" />
<Key <Key
latin:keyStyle="num5KeyStyle" /> latin:keyStyle="num5KeyStyle" />
<Key <Key
latin:keyStyle="num6KeyStyle" /> latin:keyStyle="num6KeyStyle" />
<Key <Key
latin:keyStyle="returnKeyStyle" latin:keyStyle="returnKeyStyle"
latin:keyXPos="-15.704%p" latin:keyXPos="-11.172%p"
latin:keyWidth="0%p" latin:keyWidth="0%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
@ -121,7 +121,7 @@
latin:keyWidth="8.047%p" /> latin:keyWidth="8.047%p" />
<Key <Key
latin:keyStyle="num7KeyStyle" latin:keyStyle="num7KeyStyle"
latin:keyXPos="45.0%p" /> latin:keyXPos="43.125%p" />
<Key <Key
latin:keyStyle="num8KeyStyle" /> latin:keyStyle="num8KeyStyle" />
<Key <Key
@ -148,7 +148,7 @@
latin:keyWidth="24.14%p" /> latin:keyWidth="24.14%p" />
<Key <Key
latin:keyStyle="numStarKeyStyle" latin:keyStyle="numStarKeyStyle"
latin:keyXPos="45.0%p" /> latin:keyXPos="43.125%p" />
<Key <Key
latin:keyStyle="num0KeyStyle" /> latin:keyStyle="num0KeyStyle" />
<Key <Key

10
java/src/com/android/inputmethod/keyboard/Key.java
View File

@ -216,11 +216,11 @@ public class Key {
if (keyXPos < 0) { if (keyXPos < 0) {
// If keyXPos is negative, the actual x-coordinate will be k + keyXPos. // If keyXPos is negative, the actual x-coordinate will be k + keyXPos.
keyXPos += keyboardWidth; keyXPos += keyboardWidth;
if (keyXPos < x) { }
// keyXPos shouldn't be less than x because drawable area for this key starts if (keyXPos < x) {
// at x. Or, this key will overlaps the adjacent key on its left hand side. // keyXPos shouldn't be less than x because drawable area for this key starts
keyXPos = x; // at x. Or, this key will overlaps the adjacent key on its left hand side.
} keyXPos = x;
} }
if (keyWidth == 0) { if (keyWidth == 0) {
// If keyWidth is zero, the actual key width will be determined to fill out the // If keyWidth is zero, the actual key width will be determined to fill out the

2
java/src/com/android/inputmethod/keyboard/KeyboardParser.java
View File

@ -549,7 +549,7 @@ public class KeyboardParser {
} }
private void endKey(Key key) { private void endKey(Key key) {
mCurrentX = key.mX + key.mGap + key.mWidth; mCurrentX = key.mX - key.mGap / 2 + key.mWidth + key.mGap;
if (mCurrentX > mMaxRowWidth) if (mCurrentX > mMaxRowWidth)
mMaxRowWidth = mCurrentX; mMaxRowWidth = mCurrentX;
} }