diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-08-07 11:37:11 +0000 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2014-08-07 11:37:11 +0000 |
| commit | 44e20f4fb42380061b1c4aa8905c2b301d7130cd (patch) | |
| tree | e35a29294bc5245ae2cb0e1874504ea83911e32d /java/res | |
| parent | cdcaa37a372799eecf796f7002bf49bf3a5f42c1 (diff) | |
| download | latinime-44e20f4fb42380061b1c4aa8905c2b301d7130cd.tar.gz latinime-44e20f4fb42380061b1c4aa8905c2b301d7130cd.tar.xz latinime-44e20f4fb42380061b1c4aa8905c2b301d7130cd.zip | |
Revert "Remove unused Key and Keyboard attributes"
This reverts commit cdcaa37a372799eecf796f7002bf49bf3a5f42c1.
Due to unit test breakage.
Change-Id: I1c22edf983f6e03a34b86d7c1fae3d3188447a75
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values-sw600dp/config.xml | 1 | ||||
| -rw-r--r-- | java/res/values-sw768dp/config.xml | 1 | ||||
| -rw-r--r-- | java/res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | java/res/values/config.xml | 1 | ||||
| -rw-r--r-- | java/res/values/themes-common.xml | 1 |
5 files changed, 7 insertions, 0 deletions
diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml index 7af79f085..9d16e2cb9 100644 --- a/java/res/values-sw600dp/config.xml +++ b/java/res/values-sw600dp/config.xml @@ -47,6 +47,7 @@ <fraction name="config_key_letter_ratio">42%</fraction> <fraction name="config_key_large_letter_ratio">45%</fraction> <fraction name="config_key_label_ratio">25%</fraction> + <fraction name="config_key_large_label_ratio">32%</fraction> <fraction name="config_key_hint_letter_ratio">23%</fraction> <fraction name="config_key_hint_label_ratio">28%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">22%</fraction> diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml index 12dd23279..635061d24 100644 --- a/java/res/values-sw768dp/config.xml +++ b/java/res/values-sw768dp/config.xml @@ -45,6 +45,7 @@ <fraction name="config_key_letter_ratio">40%</fraction> <fraction name="config_key_large_letter_ratio">42%</fraction> <fraction name="config_key_label_ratio">28%</fraction> + <fraction name="config_key_large_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_shifted_letter_hint_ratio">26%</fraction> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 52683da2c..37ba3963b 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -300,6 +300,7 @@ <flag name="followKeyLargeLetterRatio" value="0x40" /> <flag name="followKeyLetterRatio" value="0x80" /> <flag name="followKeyLabelRatio" value="0xC0" /> + <flag name="followKeyLargeLabelRatio" value="0x100" /> <flag name="followKeyHintLabelRatio" value="0x140" /> <flag name="hasPopupHint" value="0x200" /> <flag name="hasShiftedLetterHint" value="0x400" /> @@ -358,6 +359,8 @@ <attr name="keyLabelSize" format="dimension|fraction" /> <!-- Large size of the text for one letter keys, in the proportion of key height. --> <attr name="keyLargeLetterRatio" format="fraction" /> + <!-- Large size of the text for keys with multiple letters, in the proportion of key height. --> + <attr name="keyLargeLabelRatio" format="fraction" /> <!-- Size of the text for hint letter (= one character hint label), in the proportion of key height. --> <attr name="keyHintLetterRatio" format="fraction" /> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index ce93c7e57..d748c9179 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -49,6 +49,7 @@ <fraction name="config_key_letter_ratio">55%</fraction> <fraction name="config_key_large_letter_ratio">65%</fraction> <fraction name="config_key_label_ratio">34%</fraction> + <fraction name="config_key_large_label_ratio">40%</fraction> <fraction name="config_key_hint_letter_ratio">25%</fraction> <fraction name="config_key_hint_label_ratio">44%</fraction> <fraction name="config_key_shifted_letter_hint_ratio">35%</fraction> diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml index 44b1c7b96..cf7888ad6 100644 --- a/java/res/values/themes-common.xml +++ b/java/res/values/themes-common.xml @@ -37,6 +37,7 @@ <item name="keyLetterSize">@fraction/config_key_letter_ratio</item> <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item> <item name="keyLabelSize">@fraction/config_key_label_ratio</item> + <item name="keyLargeLabelRatio">@fraction/config_key_large_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="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio</item> |