Skip to content
Snippets Groups Projects
Commit 981d465d authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Fix symbol letter size of phone/number layout 

This CL
- decreases the size of symbols letter on number and phone layout.
- increases the size of "Pause" and "Wait" label.
- fixes "Pause" and "Wait" label for no language keyboard

Bug: 18179572
Change-Id: I6e8b4a8e07d805c3da0558b4832291ce41ad3db0
parent d071545d
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_normal.xml
+ 16
− 12
View file @ 981d465d
...@@ -24,17 +24,17 @@ ...@@ -24,17 +24,17 @@
<Row> <Row>
<Key <Key
latin:keySpec="-" latin:keySpec="-"
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<Key <Key
latin:keySpec="+" latin:keySpec="+"
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<Key <Key
latin:keySpec="." latin:keySpec="."
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<Key <Key
...@@ -53,13 +53,15 @@ ...@@ -53,13 +53,15 @@
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
<!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
<Key <Key
latin:keyStyle="numStarKeyStyle" latin:keySpec="&#xFF0A;|*"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<Key <Key
latin:keySpec="/" latin:keySpec="/"
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<switch> <switch>
...@@ -70,14 +72,14 @@ ...@@ -70,14 +72,14 @@
latin:keySpec="," latin:keySpec=","
latin:keyLabelFlags="hasPopupHint" latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/morekeys_am_pm" latin:moreKeys="!text/morekeys_am_pm"
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
</case> </case>
<default> <default>
<Key <Key
latin:keySpec="," latin:keySpec=","
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
</default> </default>
...@@ -100,12 +102,12 @@ ...@@ -100,12 +102,12 @@
<Row> <Row>
<Key <Key
latin:keySpec="(" latin:keySpec="("
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<Key <Key
latin:keySpec=")" latin:keySpec=")"
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<switch> <switch>
...@@ -114,14 +116,14 @@ ...@@ -114,14 +116,14 @@
> >
<Key <Key
latin:keySpec=":" latin:keySpec=":"
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
</case> </case>
<default> <default>
<Key <Key
latin:keySpec="=" latin:keySpec="="
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
</default> </default>
...@@ -143,8 +145,10 @@ ...@@ -143,8 +145,10 @@
<Key <Key
latin:keyStyle="tabletNumSpaceKeyStyle" latin:keyStyle="tabletNumSpaceKeyStyle"
latin:keyWidth="30%p" /> latin:keyWidth="30%p" />
<!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
<Key <Key
latin:keyStyle="numStarKeyStyle" latin:keySpec="&#xFF0A;|*"
latin:keyStyle="numSymbolKeyStyle"
latin:keyXPos="31%p" /> latin:keyXPos="31%p" />
<Key <Key
latin:keySpec="0" latin:keySpec="0"
......
java/res/xml-sw600dp/rows_phone.xml
+ 17
− 11
View file @ 981d465d
...@@ -28,16 +28,18 @@ ...@@ -28,16 +28,18 @@
<Row> <Row>
<Key <Key
latin:keySpec="-" latin:keySpec="-"
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<Key <Key
latin:keySpec="+" latin:keySpec="+"
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<Key <Key
latin:keyStyle="numPauseKeyStyle" latin:keySpec="!string/label_pause_key|,"
latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<Key <Key
...@@ -55,16 +57,18 @@ ...@@ -55,16 +57,18 @@
<Row> <Row>
<Key <Key
latin:keySpec="," latin:keySpec=","
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<Key <Key
latin:keySpec="." latin:keySpec="."
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<Key <Key
latin:keyStyle="numWaitKeyStyle" latin:keySpec="!string/label_wait_key|;"
latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<Key <Key
...@@ -82,17 +86,17 @@ ...@@ -82,17 +86,17 @@
<Row> <Row>
<Key <Key
latin:keySpec="(" latin:keySpec="("
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<Key <Key
latin:keySpec=")" latin:keySpec=")"
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<Key <Key
latin:keySpec="N" latin:keySpec="N"
latin:keyStyle="numKeyStyle" latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p" latin:keyWidth="10%p"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<Key <Key
...@@ -109,14 +113,16 @@ ...@@ -109,14 +113,16 @@
<Key <Key
latin:keyStyle="tabletNumSpaceKeyStyle" latin:keyStyle="tabletNumSpaceKeyStyle"
latin:keyWidth="30%p" /> latin:keyWidth="30%p" />
<!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
<Key <Key
latin:keyStyle="numStarKeyStyle" latin:keySpec="&#xFF0A;|*"
latin:keyStyle="numSymbolKeyStyle"
latin:keyXPos="31%p" /> latin:keyXPos="31%p" />
<Key <Key
latin:keyStyle="num0KeyStyle" latin:keyStyle="num0KeyStyle"
latin:keyHintLabel="+" /> latin:keyHintLabel="+" />
<Key <Key
latin:keySpec="\#" latin:keySpec="\#"
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numSymbolKeyStyle" />
</Row> </Row>
</merge> </merge>
java/res/xml/key_styles_number.xml
+ 1
− 18
View file @ 981d465d
...@@ -33,9 +33,7 @@ ...@@ -33,9 +33,7 @@
latin:keyLabelFlags="fontNormal|followKeyLetterRatio|followFunctionalTextColor" latin:keyLabelFlags="fontNormal|followKeyLetterRatio|followFunctionalTextColor"
latin:parentStyle="numKeyBaseStyle" /> latin:parentStyle="numKeyBaseStyle" />
<key-style <key-style
latin:styleName="numFunctionalKeyStyle" latin:styleName="numSymbolKeyStyle"
latin:keyLabelFlags="followKeyLargeLetterRatio"
latin:backgroundType="functional"
latin:parentStyle="numKeyBaseStyle" /> latin:parentStyle="numKeyBaseStyle" />
<key-style <key-style
latin:styleName="numberKeyStyle" latin:styleName="numberKeyStyle"
...@@ -89,11 +87,6 @@ ...@@ -89,11 +87,6 @@
latin:keySpec="9" latin:keySpec="9"
latin:keyHintLabel="WXYZ" latin:keyHintLabel="WXYZ"
latin:parentStyle="numberKeyStyle" /> latin:parentStyle="numberKeyStyle" />
<!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
<key-style
latin:styleName="numStarKeyStyle"
latin:keySpec="&#xFF0A;|*"
latin:parentStyle="numKeyStyle" />
<!-- Only for non-tablet device --> <!-- Only for non-tablet device -->
<key-style <key-style
latin:styleName="numPhoneToSymbolKeyStyle" latin:styleName="numPhoneToSymbolKeyStyle"
...@@ -103,16 +96,6 @@ ...@@ -103,16 +96,6 @@
latin:styleName="numPhoneToNumericKeyStyle" latin:styleName="numPhoneToNumericKeyStyle"
latin:keySpec="!text/keylabel_to_phone_numeric|!code/key_switch_alpha_symbol" latin:keySpec="!text/keylabel_to_phone_numeric|!code/key_switch_alpha_symbol"
latin:parentStyle="numModeKeyStyle" /> 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 <key-style
latin:styleName="numTabKeyStyle" latin:styleName="numTabKeyStyle"
latin:keyActionFlags="noKeyPreview" latin:keyActionFlags="noKeyPreview"
......
java/res/xml/rows_number_normal.xml
+ 9
− 5
View file @ 981d465d
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
latin:keySpec="-" latin:keySpec="-"
latin:moreKeys="+" latin:moreKeys="+"
latin:keyLabelFlags="hasPopupHint" latin:keyLabelFlags="hasPopupHint"
latin:keyStyle="numFunctionalKeyStyle" latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
...@@ -54,7 +55,8 @@ ...@@ -54,7 +55,8 @@
> >
<Key <Key
latin:keySpec="." latin:keySpec="."
latin:keyStyle="numFunctionalKeyStyle" latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</case> </case>
<case <case
...@@ -62,15 +64,17 @@ ...@@ -62,15 +64,17 @@
> >
<Key <Key
latin:keySpec="." latin:keySpec="."
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/morekeys_am_pm" latin:moreKeys="!text/morekeys_am_pm"
latin:keyStyle="numFunctionalKeyStyle" latin:keyLabelFlags="hasPopupHint"
latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</case> </case>
<default> <default>
<Key <Key
latin:keySpec="," latin:keySpec=","
latin:keyStyle="numFunctionalKeyStyle" latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</default> </default>
</switch> </switch>
......
java/res/xml/rows_phone.xml
+ 4
− 2
View file @ 981d465d
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
latin:keySpec="-" latin:keySpec="-"
latin:moreKeys="+" latin:moreKeys="+"
latin:keyLabelFlags="hasPopupHint" latin:keyLabelFlags="hasPopupHint"
latin:keyStyle="numFunctionalKeyStyle" latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
...@@ -48,7 +49,8 @@ ...@@ -48,7 +49,8 @@
latin:keyStyle="num6KeyStyle" /> latin:keyStyle="num6KeyStyle" />
<Key <Key
latin:keySpec="." latin:keySpec="."
latin:keyStyle="numFunctionalKeyStyle" latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
......
java/res/xml/rows_phone_symbols.xml
+ 20
− 12
View file @ 981d465d
...@@ -28,45 +28,53 @@ ...@@ -28,45 +28,53 @@
<Row> <Row>
<Key <Key
latin:keySpec="(" latin:keySpec="("
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numSymbolKeyStyle" />
<Key <Key
latin:keySpec="/" latin:keySpec="/"
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numSymbolKeyStyle" />
<Key <Key
latin:keySpec=")" latin:keySpec=")"
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numSymbolKeyStyle" />
<Key <Key
latin:keySpec="-" latin:keySpec="-"
latin:moreKeys="+" latin:moreKeys="+"
latin:keyLabelFlags="hasPopupHint" latin:keyLabelFlags="hasPopupHint"
latin:keyStyle="numFunctionalKeyStyle" latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
<Key <Key
latin:keySpec="N" latin:keySpec="N"
latin:keyStyle="numKeyBaseStyle" /> latin:keyStyle="numSymbolKeyStyle" />
<!-- Pause is a comma. Check PhoneNumberUtils.java to see if this <!-- Pause is a comma. Check PhoneNumberUtils.java to see if this
has changed. --> has changed. -->
<Key <Key
latin:keyStyle="numPauseKeyStyle" /> latin:keySpec="!string/label_pause_key|,"
latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
latin:keyStyle="numSymbolKeyStyle" />
<Key <Key
latin:keySpec="," latin:keySpec=","
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numSymbolKeyStyle" />
<Key <Key
latin:keySpec="." latin:keySpec="."
latin:keyStyle="numFunctionalKeyStyle" latin:keyStyle="numKeyStyle"
latin:backgroundType="functional"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
<!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
<Key <Key
latin:keyStyle="numStarKeyStyle" /> latin:keySpec="&#xFF0A;|*"
latin:keyStyle="numSymbolKeyStyle" />
<!-- Wait is a semicolon. --> <!-- Wait is a semicolon. -->
<Key <Key
latin:keyStyle="numWaitKeyStyle" /> latin:keySpec="!string/label_wait_key|;"
latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
latin:keyStyle="numSymbolKeyStyle" />
<Key <Key
latin:keySpec="\#" latin:keySpec="\#"
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numSymbolKeyStyle" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
...@@ -76,7 +84,7 @@ ...@@ -76,7 +84,7 @@
latin:keyStyle="numPhoneToNumericKeyStyle" /> latin:keyStyle="numPhoneToNumericKeyStyle" />
<Key <Key
latin:keySpec="+" latin:keySpec="+"
latin:keyStyle="numKeyStyle" /> latin:keyStyle="numSymbolKeyStyle" />
<Key <Key
latin:keyStyle="numSpaceKeyStyle" /> latin:keyStyle="numSpaceKeyStyle" />
<Key <Key
......
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