am 50cae6f0: am 52183821: Merge "Revert "Tune number letter size of Material keyboard"" into lmp-dev

* commit '50cae6f08c53c7fda6f62058227b80a70e9ed1c4':
  Revert "Tune number letter size of Material keyboard"
main
Ken Wakasa 2014-08-07 11:48:14 +00:00 committed by Android Git Automerger
commit e4ea3cce2c
9 changed files with 20 additions and 34 deletions

View File

@ -43,12 +43,10 @@
<fraction name="config_key_preview_text_ratio">90%</fraction> <fraction name="config_key_preview_text_ratio">90%</fraction>
<fraction name="config_key_letter_ratio">65%</fraction> <fraction name="config_key_letter_ratio">65%</fraction>
<fraction name="config_key_large_letter_ratio_holo">74%</fraction> <fraction name="config_key_large_letter_ratio">74%</fraction>
<fraction name="config_key_large_letter_ratio_lxx">90%</fraction>
<fraction name="config_key_label_ratio">40%</fraction> <fraction name="config_key_label_ratio">40%</fraction>
<fraction name="config_key_hint_letter_ratio">30%</fraction> <fraction name="config_key_hint_letter_ratio">30%</fraction>
<fraction name="config_key_hint_label_ratio_holo">52%</fraction> <fraction name="config_key_hint_label_ratio">52%</fraction>
<fraction name="config_key_hint_label_ratio_lxx">30%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">40%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">40%</fraction>
<fraction name="config_language_on_spacebar_text_ratio">40.000%</fraction> <fraction name="config_language_on_spacebar_text_ratio">40.000%</fraction>

View File

@ -33,12 +33,10 @@
<fraction name="config_key_horizontal_gap_holo">0.9%p</fraction> <fraction name="config_key_horizontal_gap_holo">0.9%p</fraction>
<fraction name="config_key_letter_ratio">50%</fraction> <fraction name="config_key_letter_ratio">50%</fraction>
<fraction name="config_key_large_letter_ratio_holo">48%</fraction> <fraction name="config_key_large_letter_ratio">48%</fraction>
<fraction name="config_key_large_letter_ratio_lxx">60%</fraction>
<fraction name="config_key_label_ratio">32%</fraction> <fraction name="config_key_label_ratio">32%</fraction>
<fraction name="config_key_hint_letter_ratio">23%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction>
<fraction name="config_key_hint_label_ratio_holo">34%</fraction> <fraction name="config_key_hint_label_ratio">34%</fraction>
<fraction name="config_key_hint_label_ratio_lxx">20%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">29%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">29%</fraction>
<fraction name="config_language_on_spacebar_text_ratio">30.0%</fraction> <fraction name="config_language_on_spacebar_text_ratio">30.0%</fraction>
<dimen name="config_key_shifted_letter_hint_padding">4dp</dimen> <dimen name="config_key_shifted_letter_hint_padding">4dp</dimen>

View File

@ -45,12 +45,10 @@
<dimen name="config_key_preview_height">94.5dp</dimen> <dimen name="config_key_preview_height">94.5dp</dimen>
<fraction name="config_key_preview_text_ratio">50%</fraction> <fraction name="config_key_preview_text_ratio">50%</fraction>
<fraction name="config_key_letter_ratio">42%</fraction> <fraction name="config_key_letter_ratio">42%</fraction>
<fraction name="config_key_large_letter_ratio_holo">45%</fraction> <fraction name="config_key_large_letter_ratio">45%</fraction>
<fraction name="config_key_large_letter_ratio_lxx">60%</fraction>
<fraction name="config_key_label_ratio">25%</fraction> <fraction name="config_key_label_ratio">25%</fraction>
<fraction name="config_key_hint_letter_ratio">23%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction>
<fraction name="config_key_hint_label_ratio_holo">28%</fraction> <fraction name="config_key_hint_label_ratio">28%</fraction>
<fraction name="config_key_hint_label_ratio_lxx">20%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">22%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">22%</fraction>
<fraction name="config_language_on_spacebar_text_ratio">28.0%</fraction> <fraction name="config_language_on_spacebar_text_ratio">28.0%</fraction>
<dimen name="config_key_hint_letter_padding">3dp</dimen> <dimen name="config_key_hint_letter_padding">3dp</dimen>

View File

@ -35,12 +35,10 @@
<dimen name="config_key_preview_height">107.1dp</dimen> <dimen name="config_key_preview_height">107.1dp</dimen>
<fraction name="config_key_letter_ratio">43%</fraction> <fraction name="config_key_letter_ratio">43%</fraction>
<fraction name="config_key_large_letter_ratio_holo">42%</fraction> <fraction name="config_key_large_letter_ratio">42%</fraction>
<fraction name="config_key_large_letter_ratio_lxx">60%</fraction>
<fraction name="config_key_label_ratio">28%</fraction> <fraction name="config_key_label_ratio">28%</fraction>
<fraction name="config_key_hint_letter_ratio">23%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction>
<fraction name="config_key_hint_label_ratio_holo">28%</fraction> <fraction name="config_key_hint_label_ratio">28%</fraction>
<fraction name="config_key_hint_label_ratio_lxx">20%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">24%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">24%</fraction>
<fraction name="config_language_on_spacebar_text_ratio">24.00%</fraction> <fraction name="config_language_on_spacebar_text_ratio">24.00%</fraction>

View File

@ -43,12 +43,10 @@
<dimen name="config_key_preview_height">94.5dp</dimen> <dimen name="config_key_preview_height">94.5dp</dimen>
<fraction name="config_key_preview_text_ratio">50%</fraction> <fraction name="config_key_preview_text_ratio">50%</fraction>
<fraction name="config_key_letter_ratio">40%</fraction> <fraction name="config_key_letter_ratio">40%</fraction>
<fraction name="config_key_large_letter_ratio_holo">42%</fraction> <fraction name="config_key_large_letter_ratio">42%</fraction>
<fraction name="config_key_large_letter_ratio_lxx">60%</fraction>
<fraction name="config_key_label_ratio">28%</fraction> <fraction name="config_key_label_ratio">28%</fraction>
<fraction name="config_key_hint_letter_ratio">23%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction>
<fraction name="config_key_hint_label_ratio_holo">28%</fraction> <fraction name="config_key_hint_label_ratio">28%</fraction>
<fraction name="config_key_hint_label_ratio_lxx">20%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">26%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">26%</fraction>
<fraction name="config_language_on_spacebar_text_ratio">29.03%</fraction> <fraction name="config_language_on_spacebar_text_ratio">29.03%</fraction>
<dimen name="config_key_hint_letter_padding">3dp</dimen> <dimen name="config_key_hint_letter_padding">3dp</dimen>

View File

@ -47,12 +47,10 @@
<dimen name="config_key_preview_height">80dp</dimen> <dimen name="config_key_preview_height">80dp</dimen>
<fraction name="config_key_preview_text_ratio">82%</fraction> <fraction name="config_key_preview_text_ratio">82%</fraction>
<fraction name="config_key_letter_ratio">55%</fraction> <fraction name="config_key_letter_ratio">55%</fraction>
<fraction name="config_key_large_letter_ratio_holo">65%</fraction> <fraction name="config_key_large_letter_ratio">65%</fraction>
<fraction name="config_key_large_letter_ratio_lxx">90%</fraction>
<fraction name="config_key_label_ratio">34%</fraction> <fraction name="config_key_label_ratio">34%</fraction>
<fraction name="config_key_hint_letter_ratio">25%</fraction> <fraction name="config_key_hint_letter_ratio">25%</fraction>
<fraction name="config_key_hint_label_ratio_holo">44%</fraction> <fraction name="config_key_hint_label_ratio">44%</fraction>
<fraction name="config_key_hint_label_ratio_lxx">30%</fraction>
<fraction name="config_key_shifted_letter_hint_ratio">35%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">35%</fraction>
<fraction name="config_language_on_spacebar_text_ratio">33.735%</fraction> <fraction name="config_language_on_spacebar_text_ratio">33.735%</fraction>
<dimen name="config_key_hint_letter_padding">1dp</dimen> <dimen name="config_key_hint_letter_padding">1dp</dimen>

View File

@ -35,11 +35,13 @@
</style> </style>
<style name="KeyboardView"> <style name="KeyboardView">
<item name="keyLetterSize">@fraction/config_key_letter_ratio</item> <item name="keyLetterSize">@fraction/config_key_letter_ratio</item>
<item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_holo</item> <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item>
<item name="keyLabelSize">@fraction/config_key_label_ratio</item> <item name="keyLabelSize">@fraction/config_key_label_ratio</item>
<item name="keyHintLetterRatio">@fraction/config_key_hint_letter_ratio</item> <item name="keyHintLetterRatio">@fraction/config_key_hint_letter_ratio</item>
<item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_holo</item> <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</item>
<item name="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio</item> <item name="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio</item>
<item name="keyLabelOffCenterRatio">-175%</item>
<item name="keyHintLabelOffCenterRatio">200%</item>
<item name="keyTypeface">normal</item> <item name="keyTypeface">normal</item>
<!-- A negative value to disable key text shadow layer. --> <!-- A negative value to disable key text shadow layer. -->
<item name="keyTextShadowRadius">-1.0</item> <item name="keyTextShadowRadius">-1.0</item>

View File

@ -25,10 +25,8 @@
parent="KeyboardView" parent="KeyboardView"
> >
<item name="keyTypeface">bold</item> <item name="keyTypeface">bold</item>
<item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_holo</item> <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item>
<item name="keyLabelOffCenterRatio">-175%</item> <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</item>
<item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_holo</item>
<item name="keyHintLabelOffCenterRatio">200%</item>
<!-- U+2026: "…" HORIZONTAL ELLIPSIS --> <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
<item name="keyPopupHintLetter">&#x2026;</item> <item name="keyPopupHintLetter">&#x2026;</item>
</style> </style>

View File

@ -25,10 +25,8 @@
parent="KeyboardView" parent="KeyboardView"
> >
<item name="keyTypeface">normal</item> <item name="keyTypeface">normal</item>
<item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_lxx</item> <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item>
<item name="keyLabelOffCenterRatio">-100%</item> <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</item>
<item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_lxx</item>
<item name="keyHintLabelOffCenterRatio">400%</item>
<item name="spacebarIconWidthRatio">0.9</item> <item name="spacebarIconWidthRatio">0.9</item>
<!-- No popup hint letter --> <!-- No popup hint letter -->
<item name="keyPopupHintLetter"></item> <item name="keyPopupHintLetter"></item>