diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-09-13 22:00:21 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-09-13 22:00:23 +0000 |
| commit | 941531b26eb0d95028357ab5615e89227cf84de6 (patch) | |
| tree | 59aee4f96b2026d60a7806ff295788d3691d5ffd /java/res/values | |
| parent | 991571ff456ebe181489f8dbb737fce941d6a78c (diff) | |
| parent | ef7124b6fd2b3f365080da1b74896af97efd2499 (diff) | |
| download | latinime-941531b26eb0d95028357ab5615e89227cf84de6.tar.gz latinime-941531b26eb0d95028357ab5615e89227cf84de6.tar.xz latinime-941531b26eb0d95028357ab5615e89227cf84de6.zip | |
Merge "Tune keyboard height and letter size of tablet" into lmp-dev
Diffstat (limited to 'java/res/values')
| -rw-r--r-- | java/res/values/config.xml | 12 | ||||
| -rw-r--r-- | java/res/values/themes-common.xml | 6 | ||||
| -rw-r--r-- | java/res/values/themes-holo.xml | 4 | ||||
| -rw-r--r-- | java/res/values/themes-lxx.xml | 4 |
4 files changed, 16 insertions, 10 deletions
diff --git a/java/res/values/config.xml b/java/res/values/config.xml index af3b5890b..16826f6c7 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -46,14 +46,18 @@ <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_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_lxx">90%</fraction> - <fraction name="config_key_label_ratio">34%</fraction> - <fraction name="config_key_hint_letter_ratio">25%</fraction> + <fraction name="config_key_label_ratio_holo">34%</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_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> <dimen name="config_key_hint_letter_padding">1dp</dimen> <dimen name="config_key_shifted_letter_hint_padding">2dp</dimen> diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml index becaddd35..87dcb7732 100644 --- a/java/res/values/themes-common.xml +++ b/java/res/values/themes-common.xml @@ -37,12 +37,6 @@ <!-- This keyBackground is needed to run unit tests based on {@link InputTestBase}. --> <!-- 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_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> <!-- 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 cb3ad7a3a..9f1bd2f78 100644 --- a/java/res/values/themes-holo.xml +++ b/java/res/values/themes-holo.xml @@ -25,6 +25,10 @@ parent="KeyboardView" > <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="keyLabelOffCenterRatio">-175%</item> <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_holo</item> diff --git a/java/res/values/themes-lxx.xml b/java/res/values/themes-lxx.xml index 1c33cd60b..c72188871 100644 --- a/java/res/values/themes-lxx.xml +++ b/java/res/values/themes-lxx.xml @@ -25,6 +25,10 @@ parent="KeyboardView" > <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="keyLabelOffCenterRatio">-80%</item> <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_lxx</item> |