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

am ed264f80: Merge "Fix symbol letter size of phone/number layout" 

* commit 'ed264f80dc4151ecd3d0ecbffd5be9008010e050':
  Fix symbol letter size of phone/number layout
main
Tadashi G. Takaoka 2014-11-04 08:51:40 +00:00 committed by Android Git Automerger
parent c133c35607 ed264f80dc
commit e75b9b6a9e
6 changed files with 67 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
java/res/xml-sw600dp/rows_number_normal.xml
View File

@ -24,17 +24,17 @@
<Row>
<Key
latin:keySpec="-"
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec="+"
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec="."
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
@ -53,13 +53,15 @@
latin:keyWidth="fillRight" />
</Row>
<Row>
<!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
<Key
latin:keyStyle="numStarKeyStyle"
latin:keySpec="&#xFF0A;|*"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec="/"
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<switch>
@ -70,14 +72,14 @@
latin:keySpec=","
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/morekeys_am_pm"
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</case>
<default>
<Key
latin:keySpec=","
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</default>
@ -100,12 +102,12 @@
<Row>
<Key
latin:keySpec="("
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec=")"
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<switch>
@ -114,14 +116,14 @@
>
<Key
latin:keySpec=":"
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</case>
<default>
<Key
latin:keySpec="="
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</default>
@ -143,8 +145,10 @@
<Key
latin:keyStyle="tabletNumSpaceKeyStyle"
latin:keyWidth="30%p" />
<!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
<Key
latin:keyStyle="numStarKeyStyle"
latin:keySpec="&#xFF0A;|*"
latin:keyStyle="numSymbolKeyStyle"
latin:keyXPos="31%p" />
<Key
latin:keySpec="0"

28
java/res/xml-sw600dp/rows_phone.xml
View File

@ -28,16 +28,18 @@
<Row>
<Key
latin:keySpec="-"
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec="+"
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keyStyle="numPauseKeyStyle"
latin:keySpec="!string/label_pause_key|,"
latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
@ -55,16 +57,18 @@
<Row>
<Key
latin:keySpec=","
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec="."
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keyStyle="numWaitKeyStyle"
latin:keySpec="!string/label_wait_key|;"
latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
@ -82,17 +86,17 @@
<Row>
<Key
latin:keySpec="("
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec=")"
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec="N"
latin:keyStyle="numKeyStyle"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
@ -109,14 +113,16 @@
<Key
latin:keyStyle="tabletNumSpaceKeyStyle"
latin:keyWidth="30%p" />
<!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
<Key
latin:keyStyle="numStarKeyStyle"
latin:keySpec="&#xFF0A;|*"
latin:keyStyle="numSymbolKeyStyle"
latin:keyXPos="31%p" />
<Key
latin:keyStyle="num0KeyStyle"
latin:keyHintLabel="+" />
<Key
latin:keySpec="\#"
latin:keyStyle="numKeyStyle" />
latin:keyStyle="numSymbolKeyStyle" />
</Row>
</merge>

19
java/res/xml/key_styles_number.xml
View File

@ -33,9 +33,7 @@
latin:keyLabelFlags="fontNormal|followKeyLetterRatio|followFunctionalTextColor"
latin:parentStyle="numKeyBaseStyle" />
<key-style
latin:styleName="numFunctionalKeyStyle"
latin:keyLabelFlags="followKeyLargeLetterRatio"
latin:backgroundType="functional"
latin:styleName="numSymbolKeyStyle"
latin:parentStyle="numKeyBaseStyle" />
<key-style
latin:styleName="numberKeyStyle"
@ -89,11 +87,6 @@
latin:keySpec="9"
latin:keyHintLabel="WXYZ"
latin:parentStyle="numberKeyStyle" />
<!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
<key-style
latin:styleName="numStarKeyStyle"
latin:keySpec="&#xFF0A;|*"
latin:parentStyle="numKeyStyle" />
<!-- Only for non-tablet device -->
<key-style
latin:styleName="numPhoneToSymbolKeyStyle"
@ -103,16 +96,6 @@
latin:styleName="numPhoneToNumericKeyStyle"
latin:keySpec="!text/keylabel_to_phone_numeric|!code/key_switch_alpha_symbol"
latin:parentStyle="numModeKeyStyle" />
<key-style
latin:styleName="numPauseKeyStyle"
latin:keySpec="!text/label_pause_key|,"
latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
latin:parentStyle="numKeyBaseStyle" />
<key-style
latin:styleName="numWaitKeyStyle"
latin:keySpec="!text/label_wait_key|;"
latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
latin:parentStyle="numKeyBaseStyle" />
<key-style
latin:styleName="numTabKeyStyle"
latin:keyActionFlags="noKeyPreview"

14
java/res/xml/rows_number_normal.xml
View File

@ -35,7 +35,8 @@
latin:keySpec="-"
latin:moreKeys="+"
latin:keyLabelFlags="hasPopupHint"
latin:keyStyle="numFunctionalKeyStyle"
latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</Row>
<Row>
@ -54,7 +55,8 @@
>
<Key
latin:keySpec="."
latin:keyStyle="numFunctionalKeyStyle"
latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</case>
<case
@ -62,15 +64,17 @@
>
<Key
latin:keySpec="."
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/morekeys_am_pm"
latin:keyStyle="numFunctionalKeyStyle"
latin:keyLabelFlags="hasPopupHint"
latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</case>
<default>
<Key
latin:keySpec=","
latin:keyStyle="numFunctionalKeyStyle"
latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</default>
</switch>

6
java/res/xml/rows_phone.xml
View File

@ -36,7 +36,8 @@
latin:keySpec="-"
latin:moreKeys="+"
latin:keyLabelFlags="hasPopupHint"
latin:keyStyle="numFunctionalKeyStyle"
latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</Row>
<Row>
@ -48,7 +49,8 @@
latin:keyStyle="num6KeyStyle" />
<Key
latin:keySpec="."
latin:keyStyle="numFunctionalKeyStyle"
latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</Row>
<Row>

32
java/res/xml/rows_phone_symbols.xml
View File

@ -28,45 +28,53 @@
<Row>
<Key
latin:keySpec="("
latin:keyStyle="numKeyStyle" />
latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keySpec="/"
latin:keyStyle="numKeyStyle" />
latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keySpec=")"
latin:keyStyle="numKeyStyle" />
latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keySpec="-"
latin:moreKeys="+"
latin:keyLabelFlags="hasPopupHint"
latin:keyStyle="numFunctionalKeyStyle"
latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</Row>
<Row>
<Key
latin:keySpec="N"
latin:keyStyle="numKeyBaseStyle" />
latin:keyStyle="numSymbolKeyStyle" />
<!-- Pause is a comma. Check PhoneNumberUtils.java to see if this
has changed. -->
<Key
latin:keyStyle="numPauseKeyStyle" />
latin:keySpec="!string/label_pause_key|,"
latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keySpec=","
latin:keyStyle="numKeyStyle" />
latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keySpec="."
latin:keyStyle="numFunctionalKeyStyle"
latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</Row>
<Row>
<!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
<Key
latin:keyStyle="numStarKeyStyle" />
latin:keySpec="&#xFF0A;|*"
latin:keyStyle="numSymbolKeyStyle" />
<!-- Wait is a semicolon. -->
<Key
latin:keyStyle="numWaitKeyStyle" />
latin:keySpec="!string/label_wait_key|;"
latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keySpec="\#"
latin:keyStyle="numKeyStyle" />
latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
@ -76,7 +84,7 @@
latin:keyStyle="numPhoneToNumericKeyStyle" />
<Key
latin:keySpec="+"
latin:keyStyle="numKeyStyle" />
latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keyStyle="numSpaceKeyStyle" />
<Key