aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-01-27 01:17:03 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-27 01:17:03 -0800
commitbb73d185cb861d4a43f4d0f3a1fc4ccfb23c6b5c (patch)
tree9877971e583d919b9d753961cac4a5ca7e19f16b /java/res
parent0920173bcb2c9c4e4dbe9f122862aae03b52724d (diff)
parent32c4635ff45b5a0de9dc6d806c2b600e6e7f3bee (diff)
downloadlatinime-bb73d185cb861d4a43f4d0f3a1fc4ccfb23c6b5c.tar.gz
latinime-bb73d185cb861d4a43f4d0f3a1fc4ccfb23c6b5c.tar.xz
latinime-bb73d185cb861d4a43f4d0f3a1fc4ccfb23c6b5c.zip
am 32c4635f: Merge "Add inactivatedLabel and inactivatedUppercaseLetter flags for Key.keyLabelFlags"
* commit '32c4635ff45b5a0de9dc6d806c2b600e6e7f3bee': Add inactivatedLabel and inactivatedUppercaseLetter flags for Key.keyLabelFlags
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/attrs.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index b3bd0fe59..bd7c550c1 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -269,6 +269,10 @@
<!-- If true, character case of code, altCode, moreKeys, keyOutputText, keyLabel,
or keyHintLabel will never be subject to change. -->
<flag name="preserveCase" value="0x8000" />
+ <!-- If true, use keyTextInactivatedColor for the label -->
+ <flag name="inactivatedLabel" value="0x10000" />
+ <!-- If true, use keyUppercaseLetterInactivatedColor for the uppercase letter -->
+ <flag name="inactivatedUppercaseLetter" value="0x20000" />
</attr>
<!-- The icon to display on the key instead of the label. -->
<attr name="keyIcon" format="enum">