diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-08-30 05:42:33 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-30 05:42:33 -0700 |
| commit | 59f9d3c8693c76236b73528b6eb950d6603df97d (patch) | |
| tree | 2547ed62540df2ea92f481c2fe833e37e72b4cc4 /java/res/xml-sw600dp | |
| parent | c9c383cf064c80eb2409ecdb36ecdd10aefdd53d (diff) | |
| parent | 5169937dd48d69e52e647662cb6fc3def5bf90d4 (diff) | |
| download | latinime-59f9d3c8693c76236b73528b6eb950d6603df97d.tar.gz latinime-59f9d3c8693c76236b73528b6eb950d6603df97d.tar.xz latinime-59f9d3c8693c76236b73528b6eb950d6603df97d.zip | |
am 5169937d: Revert "Revert "Support Emoji keyboard""
* commit '5169937dd48d69e52e647662cb6fc3def5bf90d4':
Revert "Revert "Support Emoji keyboard""
Diffstat (limited to 'java/res/xml-sw600dp')
| -rw-r--r-- | java/res/xml-sw600dp/key_f2.xml | 2 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/key_styles_common.xml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/java/res/xml-sw600dp/key_f2.xml b/java/res/xml-sw600dp/key_f2.xml index ca3b30b54..56f233da9 100644 --- a/java/res/xml-sw600dp/key_f2.xml +++ b/java/res/xml-sw600dp/key_f2.xml @@ -39,7 +39,7 @@ </case> <default> <Key - latin:keyStyle="smileyKeyStyle" /> + latin:keyStyle="emojiKeyStyle" /> </default> </switch> </merge> diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml index fc9342b91..3b20281be 100644 --- a/java/res/xml-sw600dp/key_styles_common.xml +++ b/java/res/xml-sw600dp/key_styles_common.xml @@ -123,7 +123,8 @@ latin:styleName="emojiKeyStyle" latin:code="!code/key_emoji" latin:keyIcon="!icon/emoji_key" - latin:keyActionFlags="noKeyPreview" /> + latin:keyActionFlags="noKeyPreview" + latin:backgroundType="functional" /> <key-style latin:styleName="settingsKeyStyle" latin:code="!code/key_settings" |