diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-11-30 03:15:44 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-11-30 03:15:44 -0800 |
| commit | ae7746e580a87bbe11c428105f08bcf785abea26 (patch) | |
| tree | 55040d8eabcb3b162f73740b22f3d16abd9f5bac /java/res | |
| parent | db5aedb5a5eea5224e5a732b689c97eead2e35f4 (diff) | |
| parent | 2013bab89ca2f82589f99d98d9cf3b41ea5aac65 (diff) | |
| download | latinime-ae7746e580a87bbe11c428105f08bcf785abea26.tar.gz latinime-ae7746e580a87bbe11c428105f08bcf785abea26.tar.xz latinime-ae7746e580a87bbe11c428105f08bcf785abea26.zip | |
Merge "Add Key.altCode attribute"
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/attrs.xml | 4 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/kbd_key_styles.xml | 6 | ||||
| -rw-r--r-- | java/res/xml-sw768dp/kbd_key_styles.xml | 6 | ||||
| -rw-r--r-- | java/res/xml/kbd_key_styles.xml | 6 |
4 files changed, 15 insertions, 7 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index b11e25bc3..15e006593 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -185,6 +185,8 @@ <declare-styleable name="Keyboard_Key"> <!-- The unicode value that this key outputs. --> <attr name="code" format="integer" /> + <!-- The alternate unicode value that this key outputs while typing. --> + <attr name="altCode" format="integer" /> <!-- The keys to display in the more keys keyboard. --> <attr name="moreKeys" format="string" /> <!-- Maximum column of more keys keyboard --> @@ -201,7 +203,7 @@ <!-- This should be aligned with Key.ACTION_FLAGS_* --> <flag name="isRepeatable" value="0x01" /> <flag name="noKeyPreview" value="0x02" /> - <flag name="ignoreWhileTyping" value="0x04" /> + <flag name="altCodeWhileTyping" value="0x04" /> </attr> <!-- The string of characters to output when this key is pressed. --> <attr name="keyOutputText" format="string" /> diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml index 5e9a88dd7..aba1a8029 100644 --- a/java/res/xml-sw600dp/kbd_key_styles.xml +++ b/java/res/xml-sw600dp/kbd_key_styles.xml @@ -77,13 +77,15 @@ latin:styleName="shortcutKeyStyle" latin:code="@integer/key_shortcut" latin:keyIcon="iconShortcutKey" - latin:keyActionFlags="noKeyPreview|ignoreWhileTyping" + latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" + latin:altCode="@integer/key_space" latin:parentStyle="f2PopupStyle" /> <key-style latin:styleName="settingsKeyStyle" latin:code="@integer/key_settings" latin:keyIcon="iconSettingsKey" - latin:keyActionFlags="noKeyPreview|ignoreWhileTyping" + latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" + latin:altCode="@integer/key_space" latin:backgroundType="functional" /> <key-style latin:styleName="tabKeyStyle" diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/kbd_key_styles.xml index 499728d67..e6ec53dd1 100644 --- a/java/res/xml-sw768dp/kbd_key_styles.xml +++ b/java/res/xml-sw768dp/kbd_key_styles.xml @@ -59,13 +59,15 @@ latin:styleName="shortcutKeyStyle" latin:code="@integer/key_shortcut" latin:keyIcon="iconShortcutKey" - latin:keyActionFlags="noKeyPreview|ignoreWhileTyping" + latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" + latin:altCode="@integer/key_space" latin:backgroundType="functional" /> <key-style latin:styleName="settingsKeyStyle" latin:code="@integer/key_settings" latin:keyIcon="iconSettingsKey" - latin:keyActionFlags="noKeyPreview|ignoreWhileTyping" + latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" + latin:altCode="@integer/key_space" latin:backgroundType="functional" /> <key-style latin:styleName="tabKeyStyle" diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml index 835269a4a..5714e09c5 100644 --- a/java/res/xml/kbd_key_styles.xml +++ b/java/res/xml/kbd_key_styles.xml @@ -163,13 +163,15 @@ latin:styleName="shortcutKeyStyle" latin:code="@integer/key_shortcut" latin:keyIcon="iconShortcutKey" - latin:keyActionFlags="noKeyPreview|ignoreWhileTyping" + latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" + latin:altCode="@integer/key_space" latin:parentStyle="f1PopupStyle" /> <key-style latin:styleName="settingsKeyStyle" latin:code="@integer/key_settings" latin:keyIcon="iconSettingsKey" - latin:keyActionFlags="noKeyPreview|ignoreWhileTyping" + latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" + latin:altCode="@integer/key_space" latin:backgroundType="functional" /> <key-style latin:styleName="tabKeyStyle" |