diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-06 08:38:53 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-02-06 08:38:54 +0000 |
| commit | a9b67135bd685bfdc9cbb928be24d2114d64a57a (patch) | |
| tree | 9cb2068309d166ba7ae246373988ec06d0f97998 /java/res | |
| parent | 0df462730b426f95b8cafe6948c2dc3a6e53e4a6 (diff) | |
| parent | 6193217f5c850bcfa393e18bbf3dc6e34f4cc220 (diff) | |
| download | latinime-a9b67135bd685bfdc9cbb928be24d2114d64a57a.tar.gz latinime-a9b67135bd685bfdc9cbb928be24d2114d64a57a.tar.xz latinime-a9b67135bd685bfdc9cbb928be24d2114d64a57a.zip | |
Merge "Parse keyLabel for icon, code, and outputText as well"
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/attrs.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index a9474a03a..413987880 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -240,6 +240,7 @@ </declare-styleable> <declare-styleable name="Keyboard_Key"> + <!-- TODO: Remove code attribute and consolidate with keySpec. --> <!-- The unicode value that this key outputs. Code value represented in hexadecimal prefixed with "0x" or code value reference using "!code/<code_name>" notation. --> @@ -275,8 +276,10 @@ <flag name="altCodeWhileTyping" value="0x04" /> <flag name="enableLongPress" value="0x08" /> </attr> + <!-- TODO: Remove keyOutputText attribute and consolidate with keySpec. --> <!-- The string of characters to output when this key is pressed. --> <attr name="keyOutputText" format="string" /> + <!-- TODO: Rename keyLabel to keySpec. --> <!-- The label to display on the key. --> <attr name="keyLabel" format="string" /> <!-- The hint label to display on the key in conjunction with the label. --> @@ -318,6 +321,7 @@ <!-- If true, disable additionalMoreKeys. --> <flag name="disableAdditionalMoreKeys" value="0x80000000" /> </attr> + <!-- TODO: Remove keyIcon attribute and consolidate with keySpec. --> <!-- The icon to display on the key instead of the label. --> <attr name="keyIcon" format="string" /> <!-- The icon for disabled key --> |