diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-08-07 11:38:01 +0000 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2014-08-07 11:38:36 +0000 |
| commit | 787e9a37b41c67e8683e854538b2743a2bc8fdcd (patch) | |
| tree | 9746a1f868d59435985e3539790938b4368c0944 /java/res | |
| parent | 5f57fe4ad035f3deb53a58616efea843546266b4 (diff) | |
| download | latinime-787e9a37b41c67e8683e854538b2743a2bc8fdcd.tar.gz latinime-787e9a37b41c67e8683e854538b2743a2bc8fdcd.tar.xz latinime-787e9a37b41c67e8683e854538b2743a2bc8fdcd.zip | |
Revert "Add Key label off center attribute"
This reverts commit ba49920e8046ca592d6c914b2e3f7394bf9c281c.
Due to unit test breakage.
Bug: 14419121
Change-Id: I6f4fc30b86227e59c883d202551b162dc91b4166
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/attrs.xml | 10 | ||||
| -rw-r--r-- | java/res/values/themes-common.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/key_styles_number.xml | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 91cd01723..37ba3963b 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -293,7 +293,7 @@ <attr name="keyLabelFlags" format="integer"> <!-- This should be aligned with Key.LABEL_FLAGS__* --> <flag name="alignIconToBottom" value="0x04" /> - <flag name="alignLabelOffCenter" value="0x08" /> + <flag name="alignLeftOfCenter" value="0x08" /> <flag name="fontNormal" value="0x10" /> <flag name="fontMonoSpace" value="0x20" /> <flag name="fontDefault" value="0x30" /> @@ -368,14 +368,6 @@ <attr name="keyHintLabelRatio" format="fraction" /> <!-- Size of the text for shifted letter hint, in the proportion of key height. --> <attr name="keyShiftedLetterHintRatio" format="fraction" /> - <!-- The label's horizontal offset to the center of the key. Negative is to left and - positive is to right. The value is in proportion of the width of - TypefaceUtils.KEY_LABEL_REFERENCE_CHAR. --> - <attr name="keyLabelOffCenterRatio" format="fraction" /> - <!-- The hint label's horizontal offset to the center of the key. Negative is to left and - positive is to right. The value is in proportion of the width of - TypefaceUtils.KEY_LABEL_REFERENCE_CHAR. --> - <attr name="keyHintLabelOffCenterRatio" format="fraction" /> <!-- Color to use for the label in a key. --> <attr name="keyTextColor" format="color" /> <attr name="keyTextShadowColor" format="color" /> diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml index fd1c9f8c4..cf7888ad6 100644 --- a/java/res/values/themes-common.xml +++ b/java/res/values/themes-common.xml @@ -41,8 +41,6 @@ <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> - <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/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml index 14b202874..3038097d8 100644 --- a/java/res/xml/key_styles_number.xml +++ b/java/res/xml/key_styles_number.xml @@ -39,7 +39,7 @@ latin:parentStyle="numKeyBaseStyle" /> <key-style latin:styleName="numberKeyStyle" - latin:keyLabelFlags="alignLabelOffCenter|hasHintLabel" + latin:keyLabelFlags="alignLeftOfCenter|hasHintLabel" latin:parentStyle="numKeyStyle" /> <key-style latin:styleName="num0KeyStyle" |