diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-08-07 15:20:14 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-08-07 15:20:14 +0000 |
| commit | 4290412dbefca85eab2270201ebad7fc85bcb59d (patch) | |
| tree | 03045acda20078bf585111da85548281f3284de1 /java/res | |
| parent | fd3fbdf0e6fda4f10e876b765d89dc9584983dd4 (diff) | |
| parent | f1ca6b73341aad819c651810852fd03a93c2d5cd (diff) | |
| download | latinime-4290412dbefca85eab2270201ebad7fc85bcb59d.tar.gz latinime-4290412dbefca85eab2270201ebad7fc85bcb59d.tar.xz latinime-4290412dbefca85eab2270201ebad7fc85bcb59d.zip | |
am f1ca6b73: am cbc2c253: am f7f65743: Revert "Revert "Remove unused Key and Keyboard attributes""
* commit 'f1ca6b73341aad819c651810852fd03a93c2d5cd':
Revert "Revert "Remove unused Key and Keyboard attributes""
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, 0 insertions, 7 deletions
diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml index 9d16e2cb9..7af79f085 100644 --- a/java/res/values-sw600dp/config.xml +++ b/java/res/values-sw600dp/config.xml @@ -47,7 +47,6 @@ <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 635061d24..12dd23279 100644 --- a/java/res/values-sw768dp/config.xml +++ b/java/res/values-sw768dp/config.xml @@ -45,7 +45,6 @@ <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 91cd01723..8b3687a8c 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -300,7 +300,6 @@ <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" /> @@ -359,8 +358,6 @@ <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 d748c9179..ce93c7e57 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -49,7 +49,6 @@ <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 cc61de03d..507f5cff2 100644 --- a/java/res/values/themes-common.xml +++ b/java/res/values/themes-common.xml @@ -40,7 +40,6 @@ <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> |