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

am 3c83090b: am d7b80c4e: Merge "Use large label text size for action label" into jb-dev 

* commit '3c83090bb00c14470252e0f5ab6735ec0b1b3131':
  Use large label text size for action label
main
Tadashi G. Takaoka 2012-05-21 12:44:25 -07:00 committed by Android Git Automerger
parent 45befb946f 3c83090bb0
commit 2738c762e4
7 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/res/values-sw600dp/dimens.xml
View File

@ -57,6 +57,7 @@
<fraction name="key_letter_ratio">42%</fraction>
<fraction name="key_large_letter_ratio">45%</fraction>
<fraction name="key_label_ratio">25%</fraction>
<fraction name="key_large_label_ratio">32%</fraction>
<fraction name="key_hint_letter_ratio">23%</fraction>
<fraction name="key_hint_label_ratio">28%</fraction>
<fraction name="key_uppercase_letter_ratio">22%</fraction>

1
java/res/values-sw768dp/dimens.xml
View File

@ -58,6 +58,7 @@
<fraction name="key_letter_ratio">40%</fraction>
<fraction name="key_large_letter_ratio">42%</fraction>
<fraction name="key_label_ratio">28%</fraction>
<fraction name="key_large_label_ratio">28%</fraction>
<fraction name="key_hint_letter_ratio">23%</fraction>
<fraction name="key_hint_label_ratio">28%</fraction>
<fraction name="key_uppercase_letter_ratio">26%</fraction>

1
java/res/values/dimens.xml
View File

@ -59,6 +59,7 @@
<fraction name="key_letter_ratio">55%</fraction>
<fraction name="key_large_letter_ratio">65%</fraction>
<fraction name="key_label_ratio">34%</fraction>
<fraction name="key_large_label_ratio">40%</fraction>
<fraction name="key_hint_letter_ratio">25%</fraction>
<fraction name="key_hint_label_ratio">44%</fraction>
<fraction name="key_uppercase_letter_ratio">35%</fraction>

1
java/res/values/styles.xml
View File

@ -38,6 +38,7 @@
<item name="keyLetterRatio">@fraction/key_letter_ratio</item>
<item name="keyLargeLetterRatio">@fraction/key_large_letter_ratio</item>
<item name="keyLabelRatio">@fraction/key_label_ratio</item>
<item name="keyLargeLabelRatio">@fraction/key_large_label_ratio</item>
<item name="keyHintLetterRatio">@fraction/key_hint_letter_ratio</item>
<item name="keyHintLabelRatio">@fraction/key_hint_label_ratio</item>
<item name="keyShiftedLetterHintRatio">@fraction/key_uppercase_letter_ratio</item>

9
java/res/xml-sw600dp/key_styles_common.xml
View File

@ -74,6 +74,15 @@
latin:backgroundType="functional" />
<include
latin:keyboardLayout="@xml/key_styles_enter" />
<!-- Override defaultEnterKeyStyle in key_styles_enter.xml -->
<key-style
latin:styleName="defaultEnterKeyStyle"
latin:code="!code/key_enter"
latin:keyIcon="!icon/enter_key"
latin:keyLabelFlags="preserveCase|autoXScale|followKeyLargeLabelRatio"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional"
latin:parentStyle="navigateMoreKeysStyle" />
<key-style
latin:styleName="spaceKeyStyle"
latin:code="!code/key_space"

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

@ -131,4 +131,13 @@
latin:keyIcon="!icon/space_key_for_number_layout"
latin:keyActionFlags="enableLongPress"
latin:parentStyle="numKeyBaseStyle" />
<!-- Override defaultEnterKeyStyle in key_styles_enter.xml -->
<key-style
latin:styleName="defaultEnterKeyStyle"
latin:code="!code/key_enter"
latin:keyIcon="!icon/enter_key"
latin:keyLabelFlags="preserveCase|autoXScale|followKeyLargeLabelRatio"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional"
latin:parentStyle="navigateMoreKeysStyle" />
</merge>

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

@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Row>
<Key
<Key
latin:keyLabel="1"
latin:keyStyle="numKeyStyle" />
<Key