diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values-land/config.xml | 6 | ||||
| -rw-r--r-- | java/res/values-sw600dp-land/config.xml | 6 | ||||
| -rw-r--r-- | java/res/values-sw600dp/config.xml | 6 | ||||
| -rw-r--r-- | java/res/values-sw768dp-land/config.xml | 6 | ||||
| -rw-r--r-- | java/res/values-sw768dp/config.xml | 6 | ||||
| -rw-r--r-- | java/res/values/config.xml | 6 | ||||
| -rw-r--r-- | java/res/values/themes-common.xml | 6 | ||||
| -rw-r--r-- | java/res/values/themes-holo.xml | 6 | ||||
| -rw-r--r-- | java/res/values/themes-lxx.xml | 6 |
9 files changed, 34 insertions, 20 deletions
diff --git a/java/res/values-land/config.xml b/java/res/values-land/config.xml index 5eea4c1c6..34d6d4e19 100644 --- a/java/res/values-land/config.xml +++ b/java/res/values-land/config.xml @@ -43,10 +43,12 @@ <fraction name="config_key_preview_text_ratio">90%</fraction> <fraction name="config_key_letter_ratio">65%</fraction> - <fraction name="config_key_large_letter_ratio">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_label_ratio">40%</fraction> <fraction name="config_key_hint_letter_ratio">30%</fraction> - <fraction name="config_key_hint_label_ratio">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_shifted_letter_hint_ratio">40%</fraction> <fraction name="config_language_on_spacebar_text_ratio">40.000%</fraction> diff --git a/java/res/values-sw600dp-land/config.xml b/java/res/values-sw600dp-land/config.xml index 6368eef41..c238b2c42 100644 --- a/java/res/values-sw600dp-land/config.xml +++ b/java/res/values-sw600dp-land/config.xml @@ -33,10 +33,12 @@ <fraction name="config_key_horizontal_gap_holo">0.9%p</fraction> <fraction name="config_key_letter_ratio">50%</fraction> - <fraction name="config_key_large_letter_ratio">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_label_ratio">32%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction> - <fraction name="config_key_hint_label_ratio">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_shifted_letter_hint_ratio">29%</fraction> <fraction name="config_language_on_spacebar_text_ratio">30.0%</fraction> <dimen name="config_key_shifted_letter_hint_padding">4dp</dimen> diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml index 7af79f085..3c489bbe8 100644 --- a/java/res/values-sw600dp/config.xml +++ b/java/res/values-sw600dp/config.xml @@ -45,10 +45,12 @@ <dimen name="config_key_preview_height">94.5dp</dimen> <fraction name="config_key_preview_text_ratio">50%</fraction> <fraction name="config_key_letter_ratio">42%</fraction> - <fraction name="config_key_large_letter_ratio">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_label_ratio">25%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction> - <fraction name="config_key_hint_label_ratio">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_shifted_letter_hint_ratio">22%</fraction> <fraction name="config_language_on_spacebar_text_ratio">28.0%</fraction> <dimen name="config_key_hint_letter_padding">3dp</dimen> diff --git a/java/res/values-sw768dp-land/config.xml b/java/res/values-sw768dp-land/config.xml index a1659b45a..587a3c1a4 100644 --- a/java/res/values-sw768dp-land/config.xml +++ b/java/res/values-sw768dp-land/config.xml @@ -35,10 +35,12 @@ <dimen name="config_key_preview_height">107.1dp</dimen> <fraction name="config_key_letter_ratio">43%</fraction> - <fraction name="config_key_large_letter_ratio">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_label_ratio">28%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction> - <fraction name="config_key_hint_label_ratio">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_shifted_letter_hint_ratio">24%</fraction> <fraction name="config_language_on_spacebar_text_ratio">24.00%</fraction> diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml index 12dd23279..f573c40df 100644 --- a/java/res/values-sw768dp/config.xml +++ b/java/res/values-sw768dp/config.xml @@ -43,10 +43,12 @@ <dimen name="config_key_preview_height">94.5dp</dimen> <fraction name="config_key_preview_text_ratio">50%</fraction> <fraction name="config_key_letter_ratio">40%</fraction> - <fraction name="config_key_large_letter_ratio">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_label_ratio">28%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction> - <fraction name="config_key_hint_label_ratio">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_shifted_letter_hint_ratio">26%</fraction> <fraction name="config_language_on_spacebar_text_ratio">29.03%</fraction> <dimen name="config_key_hint_letter_padding">3dp</dimen> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index ce93c7e57..af3b5890b 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -47,10 +47,12 @@ <dimen name="config_key_preview_height">80dp</dimen> <fraction name="config_key_preview_text_ratio">82%</fraction> <fraction name="config_key_letter_ratio">55%</fraction> - <fraction name="config_key_large_letter_ratio">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_label_ratio">34%</fraction> <fraction name="config_key_hint_letter_ratio">25%</fraction> - <fraction name="config_key_hint_label_ratio">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_shifted_letter_hint_ratio">35%</fraction> <fraction name="config_language_on_spacebar_text_ratio">33.735%</fraction> <dimen name="config_key_hint_letter_padding">1dp</dimen> diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml index 507f5cff2..6805830cb 100644 --- a/java/res/values/themes-common.xml +++ b/java/res/values/themes-common.xml @@ -38,13 +38,11 @@ <!-- TODO: Apply default {@link KeyboardTheme} to {@link InputTestBase} and remove this. --> <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</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</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="keyLabelOffCenterRatio">-175%</item> - <item name="keyHintLabelOffCenterRatio">200%</item> <item name="keyTypeface">normal</item> <!-- A negative value to disable key text shadow layer. --> <item name="keyTextShadowRadius">-1.0</item> diff --git a/java/res/values/themes-holo.xml b/java/res/values/themes-holo.xml index f344dd7c8..cb3ad7a3a 100644 --- a/java/res/values/themes-holo.xml +++ b/java/res/values/themes-holo.xml @@ -25,8 +25,10 @@ parent="KeyboardView" > <item name="keyTypeface">bold</item> - <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item> - <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</item> + <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_holo</item> + <item name="keyLabelOffCenterRatio">-175%</item> + <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_holo</item> + <item name="keyHintLabelOffCenterRatio">200%</item> <!-- U+2026: "…" HORIZONTAL ELLIPSIS --> <item name="keyPopupHintLetter">…</item> </style> diff --git a/java/res/values/themes-lxx.xml b/java/res/values/themes-lxx.xml index 3a022e591..f4e7933bb 100644 --- a/java/res/values/themes-lxx.xml +++ b/java/res/values/themes-lxx.xml @@ -25,8 +25,10 @@ parent="KeyboardView" > <item name="keyTypeface">normal</item> - <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item> - <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</item> + <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_lxx</item> + <item name="keyLabelOffCenterRatio">-100%</item> + <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_lxx</item> + <item name="keyHintLabelOffCenterRatio">400%</item> <item name="spacebarIconWidthRatio">0.9</item> <!-- No popup hint letter --> <item name="keyPopupHintLetter"></item> |