commit 5169937dd48d69e52e647662cb6fc3def5bf90d4
author Satoshi Kataoka <satok@google.com> Fri Aug 30 10:28:01 2013 +0000
committer Satoshi Kataoka <satok@google.com> Fri Aug 30 19:46:10 2013 +0900
tree 06d8994729aca4e4bf53b69c8a83868ee9331557
parent 9f79cf6de4eac149ffb496bea34b9d091bed7bc4

Revert "Revert "Support Emoji keyboard""

Window resizing junkiness is addressed in I605e657c9468

This reverts commit aabc97233826da69edbadfc7c1465a505a1fe2ec.

Change-Id: I0bc0f1ad9a90799e643fe9ec35f5b4bbe94eee0d

java/res/xml-sw600dp/key_f2.xml

diff --git a/java/res/xml-sw600dp/key_f2.xml b/java/res/xml-sw600dp/key_f2.xml
index ca3b30b..56f233d 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>

java/res/xml-sw600dp/key_styles_common.xml

diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index fc9342b..3b20281 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"