diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-08-30 07:27:48 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-08-30 07:27:48 +0000 |
| commit | 4445671efc673165979195c13f197128c14fbe7c (patch) | |
| tree | a611e1520332eb2315b2aa242f7a939e41b7cf53 /java/res/xml-sw600dp | |
| parent | ab4c846b7f025f333b766de5eb5340862464d8de (diff) | |
| parent | aabc97233826da69edbadfc7c1465a505a1fe2ec (diff) | |
| download | latinime-4445671efc673165979195c13f197128c14fbe7c.tar.gz latinime-4445671efc673165979195c13f197128c14fbe7c.tar.xz latinime-4445671efc673165979195c13f197128c14fbe7c.zip | |
Merge "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, 2 insertions, 3 deletions
diff --git a/java/res/xml-sw600dp/key_f2.xml b/java/res/xml-sw600dp/key_f2.xml index 56f233da9..ca3b30b54 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="emojiKeyStyle" /> + latin:keyStyle="smileyKeyStyle" /> </default> </switch> </merge> diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml index 3b20281be..fc9342b91 100644 --- a/java/res/xml-sw600dp/key_styles_common.xml +++ b/java/res/xml-sw600dp/key_styles_common.xml @@ -123,8 +123,7 @@ latin:styleName="emojiKeyStyle" latin:code="!code/key_emoji" latin:keyIcon="!icon/emoji_key" - latin:keyActionFlags="noKeyPreview" - latin:backgroundType="functional" /> + latin:keyActionFlags="noKeyPreview" /> <key-style latin:styleName="settingsKeyStyle" latin:code="!code/key_settings" |