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

Use large label text size for action label

The large label text size is used for:
* The enter key's action label on phone/number keyboard layout of
  phone device and 7-inch tablet
* The enter key's action label on alphabet/symbols keyboard of 7-inch
  tablet.

Bug: 6509415
Change-Id: I1c0dc511b3ac87cba00163b8d29c687ad1e86ce8
parent 817a66e7
No related branches found
No related tags found
No related merge requests found
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"
......
......@@ -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>
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment