am 625e0d02
: am 4821af64
: am 941531b2
: Merge "Tune keyboard height and letter size of tablet" into lmp-dev
* commit '625e0d0274106c870e7fe97181ab4e14b662494f': Tune keyboard height and letter size of tablet
This commit is contained in:
commit
7a1a0dbfd0
10 changed files with 60 additions and 32 deletions
java/res
values-land
values-sw600dp-land
values-sw600dp
values-sw768dp-land
values-sw768dp
values
|
@ -42,14 +42,18 @@
|
||||||
<dimen name="config_key_preview_offset_holo">1.6dp</dimen>
|
<dimen name="config_key_preview_offset_holo">1.6dp</dimen>
|
||||||
|
|
||||||
<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_holo">65%</fraction>
|
||||||
|
<fraction name="config_key_letter_ratio_lxx">65%</fraction>
|
||||||
<fraction name="config_key_large_letter_ratio_holo">74%</fraction>
|
<fraction name="config_key_large_letter_ratio_holo">74%</fraction>
|
||||||
<fraction name="config_key_large_letter_ratio_lxx">90%</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_holo">40%</fraction>
|
||||||
<fraction name="config_key_hint_letter_ratio">30%</fraction>
|
<fraction name="config_key_label_ratio_lxx">40%</fraction>
|
||||||
|
<fraction name="config_key_hint_letter_ratio_holo">30%</fraction>
|
||||||
|
<fraction name="config_key_hint_letter_ratio_lxx">30%</fraction>
|
||||||
<fraction name="config_key_hint_label_ratio_holo">52%</fraction>
|
<fraction name="config_key_hint_label_ratio_holo">52%</fraction>
|
||||||
<fraction name="config_key_hint_label_ratio_lxx">30%</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_holo">40%</fraction>
|
||||||
|
<fraction name="config_key_shifted_letter_hint_ratio_lxx">40%</fraction>
|
||||||
<fraction name="config_language_on_spacebar_text_ratio">40.000%</fraction>
|
<fraction name="config_language_on_spacebar_text_ratio">40.000%</fraction>
|
||||||
|
|
||||||
<!-- For 5-row keyboard -->
|
<!-- For 5-row keyboard -->
|
||||||
|
|
|
@ -33,5 +33,7 @@
|
||||||
<!-- Preferable keyboard height in absolute scale: 45.0mm -->
|
<!-- Preferable keyboard height in absolute scale: 45.0mm -->
|
||||||
<!-- Xoom -->
|
<!-- Xoom -->
|
||||||
<item>HARDWARE=stingray,265.4378</item>
|
<item>HARDWARE=stingray,265.4378</item>
|
||||||
|
<!-- Volantis -->
|
||||||
|
<item>HARDWARE=flounder,272.0</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
<!-- Preferable keyboard height in absolute scale: 45.0mm -->
|
<!-- Preferable keyboard height in absolute scale: 45.0mm -->
|
||||||
<!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
|
<!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
|
||||||
<dimen name="config_default_keyboard_height">283.5dp</dimen>
|
<dimen name="config_default_keyboard_height">283.5dp</dimen>
|
||||||
<fraction name="config_min_keyboard_height">45%p</fraction>
|
<fraction name="config_min_keyboard_height">40%p</fraction>
|
||||||
|
|
||||||
<dimen name="config_more_keys_keyboard_key_height">81.9dp</dimen>
|
<dimen name="config_more_keys_keyboard_key_height">81.9dp</dimen>
|
||||||
|
|
||||||
|
@ -32,14 +32,18 @@
|
||||||
<fraction name="config_key_vertical_gap_holo">4.5%p</fraction>
|
<fraction name="config_key_vertical_gap_holo">4.5%p</fraction>
|
||||||
<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_holo">50%</fraction>
|
||||||
|
<fraction name="config_key_letter_ratio_lxx">50%</fraction>
|
||||||
<fraction name="config_key_large_letter_ratio_holo">48%</fraction>
|
<fraction name="config_key_large_letter_ratio_holo">48%</fraction>
|
||||||
<fraction name="config_key_large_letter_ratio_lxx">60%</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_holo">32%</fraction>
|
||||||
<fraction name="config_key_hint_letter_ratio">23%</fraction>
|
<fraction name="config_key_label_ratio_lxx">32%</fraction>
|
||||||
|
<fraction name="config_key_hint_letter_ratio_holo">23%</fraction>
|
||||||
|
<fraction name="config_key_hint_letter_ratio_lxx">23%</fraction>
|
||||||
<fraction name="config_key_hint_label_ratio_holo">34%</fraction>
|
<fraction name="config_key_hint_label_ratio_holo">34%</fraction>
|
||||||
<fraction name="config_key_hint_label_ratio_lxx">20%</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_holo">29%</fraction>
|
||||||
|
<fraction name="config_key_shifted_letter_hint_ratio_lxx">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>
|
||||||
|
|
||||||
|
|
|
@ -44,14 +44,18 @@
|
||||||
|
|
||||||
<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_holo">42%</fraction>
|
||||||
|
<fraction name="config_key_letter_ratio_lxx">50%</fraction>
|
||||||
<fraction name="config_key_large_letter_ratio_holo">45%</fraction>
|
<fraction name="config_key_large_letter_ratio_holo">45%</fraction>
|
||||||
<fraction name="config_key_large_letter_ratio_lxx">60%</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_holo">25%</fraction>
|
||||||
<fraction name="config_key_hint_letter_ratio">23%</fraction>
|
<fraction name="config_key_label_ratio_lxx">32%</fraction>
|
||||||
|
<fraction name="config_key_hint_letter_ratio_holo">23%</fraction>
|
||||||
|
<fraction name="config_key_hint_letter_ratio_lxx">23%</fraction>
|
||||||
<fraction name="config_key_hint_label_ratio_holo">28%</fraction>
|
<fraction name="config_key_hint_label_ratio_holo">28%</fraction>
|
||||||
<fraction name="config_key_hint_label_ratio_lxx">20%</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_holo">22%</fraction>
|
||||||
|
<fraction name="config_key_shifted_letter_hint_ratio_lxx">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>
|
||||||
<dimen name="config_key_shifted_letter_hint_padding">3dp</dimen>
|
<dimen name="config_key_shifted_letter_hint_padding">3dp</dimen>
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
<!-- Preferable keyboard height in absolute scale: 58.0mm -->
|
<!-- Preferable keyboard height in absolute scale: 58.0mm -->
|
||||||
<!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
|
<!-- This config_default_keyboard_height value should match with keyboard-heights.xml -->
|
||||||
<dimen name="config_default_keyboard_height">365.4dp</dimen>
|
<dimen name="config_default_keyboard_height">365.4dp</dimen>
|
||||||
<fraction name="config_min_keyboard_height">45%p</fraction>
|
<fraction name="config_min_keyboard_height">35%p</fraction>
|
||||||
|
|
||||||
<fraction name="config_keyboard_top_padding_holo">1.896%p</fraction>
|
<fraction name="config_keyboard_top_padding_holo">1.896%p</fraction>
|
||||||
<fraction name="config_keyboard_bottom_padding_holo">0.0%p</fraction>
|
<fraction name="config_keyboard_bottom_padding_holo">0.0%p</fraction>
|
||||||
|
@ -34,14 +34,18 @@
|
||||||
<dimen name="config_more_keys_keyboard_key_height">81.9dp</dimen>
|
<dimen name="config_more_keys_keyboard_key_height">81.9dp</dimen>
|
||||||
|
|
||||||
<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_holo">43%</fraction>
|
||||||
|
<fraction name="config_key_letter_ratio_lxx">50%</fraction>
|
||||||
<fraction name="config_key_large_letter_ratio_holo">42%</fraction>
|
<fraction name="config_key_large_letter_ratio_holo">42%</fraction>
|
||||||
<fraction name="config_key_large_letter_ratio_lxx">60%</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_holo">28%</fraction>
|
||||||
<fraction name="config_key_hint_letter_ratio">23%</fraction>
|
<fraction name="config_key_label_ratio_lxx">32%</fraction>
|
||||||
|
<fraction name="config_key_hint_letter_ratio_holo">23%</fraction>
|
||||||
|
<fraction name="config_key_hint_letter_ratio_lxx">23%</fraction>
|
||||||
<fraction name="config_key_hint_label_ratio_holo">28%</fraction>
|
<fraction name="config_key_hint_label_ratio_holo">28%</fraction>
|
||||||
<fraction name="config_key_hint_label_ratio_lxx">20%</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_holo">24%</fraction>
|
||||||
|
<fraction name="config_key_shifted_letter_hint_ratio_lxx">24%</fraction>
|
||||||
<fraction name="config_language_on_spacebar_text_ratio">24.00%</fraction>
|
<fraction name="config_language_on_spacebar_text_ratio">24.00%</fraction>
|
||||||
|
|
||||||
<!-- For 5-row keyboard -->
|
<!-- For 5-row keyboard -->
|
||||||
|
|
|
@ -42,14 +42,18 @@
|
||||||
|
|
||||||
<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_holo">40%</fraction>
|
||||||
|
<fraction name="config_key_letter_ratio_lxx">50%</fraction>
|
||||||
<fraction name="config_key_large_letter_ratio_holo">42%</fraction>
|
<fraction name="config_key_large_letter_ratio_holo">42%</fraction>
|
||||||
<fraction name="config_key_large_letter_ratio_lxx">60%</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_holo">28%</fraction>
|
||||||
<fraction name="config_key_hint_letter_ratio">23%</fraction>
|
<fraction name="config_key_label_ratio_lxx">32%</fraction>
|
||||||
|
<fraction name="config_key_hint_letter_ratio_holo">23%</fraction>
|
||||||
|
<fraction name="config_key_hint_letter_ratio_lxx">23%</fraction>
|
||||||
<fraction name="config_key_hint_label_ratio_holo">28%</fraction>
|
<fraction name="config_key_hint_label_ratio_holo">28%</fraction>
|
||||||
<fraction name="config_key_hint_label_ratio_lxx">20%</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_holo">26%</fraction>
|
||||||
|
<fraction name="config_key_shifted_letter_hint_ratio_lxx">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>
|
||||||
<dimen name="config_key_shifted_letter_hint_padding">3dp</dimen>
|
<dimen name="config_key_shifted_letter_hint_padding">3dp</dimen>
|
||||||
|
|
|
@ -46,14 +46,18 @@
|
||||||
|
|
||||||
<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_holo">55%</fraction>
|
||||||
|
<fraction name="config_key_letter_ratio_lxx">55%</fraction>
|
||||||
<fraction name="config_key_large_letter_ratio_holo">65%</fraction>
|
<fraction name="config_key_large_letter_ratio_holo">65%</fraction>
|
||||||
<fraction name="config_key_large_letter_ratio_lxx">90%</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_holo">34%</fraction>
|
||||||
<fraction name="config_key_hint_letter_ratio">25%</fraction>
|
<fraction name="config_key_label_ratio_lxx">34%</fraction>
|
||||||
|
<fraction name="config_key_hint_letter_ratio_holo">25%</fraction>
|
||||||
|
<fraction name="config_key_hint_letter_ratio_lxx">25%</fraction>
|
||||||
<fraction name="config_key_hint_label_ratio_holo">44%</fraction>
|
<fraction name="config_key_hint_label_ratio_holo">44%</fraction>
|
||||||
<fraction name="config_key_hint_label_ratio_lxx">30%</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_holo">35%</fraction>
|
||||||
|
<fraction name="config_key_shifted_letter_hint_ratio_lxx">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>
|
||||||
<dimen name="config_key_shifted_letter_hint_padding">2dp</dimen>
|
<dimen name="config_key_shifted_letter_hint_padding">2dp</dimen>
|
||||||
|
|
|
@ -37,12 +37,6 @@
|
||||||
<!-- This keyBackground is needed to run unit tests based on {@link InputTestBase}. -->
|
<!-- This keyBackground is needed to run unit tests based on {@link InputTestBase}. -->
|
||||||
<!-- TODO: Apply default {@link KeyboardTheme} to {@link InputTestBase} and remove this. -->
|
<!-- TODO: Apply default {@link KeyboardTheme} to {@link InputTestBase} and remove this. -->
|
||||||
<item name="keyBackground">@drawable/btn_keyboard_key_klp</item>
|
<item name="keyBackground">@drawable/btn_keyboard_key_klp</item>
|
||||||
<item name="keyLetterSize">@fraction/config_key_letter_ratio</item>
|
|
||||||
<item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_holo</item>
|
|
||||||
<item name="keyLabelSize">@fraction/config_key_label_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="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio</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>
|
||||||
|
|
|
@ -25,6 +25,10 @@
|
||||||
parent="KeyboardView"
|
parent="KeyboardView"
|
||||||
>
|
>
|
||||||
<item name="keyTypeface">bold</item>
|
<item name="keyTypeface">bold</item>
|
||||||
|
<item name="keyLetterSize">@fraction/config_key_letter_ratio_holo</item>
|
||||||
|
<item name="keyLabelSize">@fraction/config_key_label_ratio_holo</item>
|
||||||
|
<item name="keyHintLetterRatio">@fraction/config_key_hint_letter_ratio_holo</item>
|
||||||
|
<item name="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio_holo</item>
|
||||||
<item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_holo</item>
|
<item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_holo</item>
|
||||||
<item name="keyLabelOffCenterRatio">-175%</item>
|
<item name="keyLabelOffCenterRatio">-175%</item>
|
||||||
<item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_holo</item>
|
<item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_holo</item>
|
||||||
|
|
|
@ -25,6 +25,10 @@
|
||||||
parent="KeyboardView"
|
parent="KeyboardView"
|
||||||
>
|
>
|
||||||
<item name="keyTypeface">normal</item>
|
<item name="keyTypeface">normal</item>
|
||||||
|
<item name="keyLetterSize">@fraction/config_key_letter_ratio_lxx</item>
|
||||||
|
<item name="keyLabelSize">@fraction/config_key_label_ratio_lxx</item>
|
||||||
|
<item name="keyHintLetterRatio">@fraction/config_key_hint_letter_ratio_lxx</item>
|
||||||
|
<item name="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio_lxx</item>
|
||||||
<item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_lxx</item>
|
<item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_lxx</item>
|
||||||
<item name="keyLabelOffCenterRatio">-80%</item>
|
<item name="keyLabelOffCenterRatio">-80%</item>
|
||||||
<item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_lxx</item>
|
<item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_lxx</item>
|
||||||
|
|
Loading…
Reference in a new issue