diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-07 02:40:09 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-02-07 02:40:09 -0800 |
| commit | 0081919ca0153d6c1d8497ec456f9b24096bcccd (patch) | |
| tree | dc7d7cf26a24b2f8984257d9161917df1429ee9a | |
| parent | a7cdaf6d129a58e5fda8f70472ae14ec1554eecd (diff) | |
| parent | c8a0117c9c5694b21be704008bfd9ecdf1071729 (diff) | |
| download | latinime-0081919ca0153d6c1d8497ec456f9b24096bcccd.tar.gz latinime-0081919ca0153d6c1d8497ec456f9b24096bcccd.tar.xz latinime-0081919ca0153d6c1d8497ec456f9b24096bcccd.zip | |
am c8a0117c: Fix undefined emojiKeyStyle
* commit 'c8a0117c9c5694b21be704008bfd9ecdf1071729':
Fix undefined emojiKeyStyle
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index d4c9b7d58..f04fc45bb 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -77,6 +77,12 @@ latin:keySpec="!icon/delete_key|!code/key_delete" latin:keyActionFlags="isRepeatable|noKeyPreview" latin:backgroundType="functional" /> + <!-- emojiKeyStyle must be defined before including @xml/key_syles_enter. --> + <key-style + latin:styleName="emojiKeyStyle" + latin:keySpec="!icon/emoji_key|!code/key_emoji" + latin:keyActionFlags="noKeyPreview" + latin:backgroundType="functional" /> <include latin:keyboardLayout="@xml/key_styles_enter" /> <key-style @@ -110,11 +116,6 @@ latin:keyActionFlags="noKeyPreview|altCodeWhileTyping|enableLongPress" latin:altCode="!code/key_space" /> <key-style - latin:styleName="emojiKeyStyle" - latin:keySpec="!icon/emoji_key|!code/key_emoji" - latin:keyActionFlags="noKeyPreview" - latin:backgroundType="functional" /> - <key-style latin:styleName="tabKeyStyle" latin:keySpec="!icon/tab_key|!code/key_tab" latin:keyIconPreview="!icon/tab_key_preview" |