From 91e69980bebc37a37f5d176450d952ba394cb303 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Fri, 23 May 2014 17:49:39 +0900
Subject: [PATCH] Use action key background for enter key

This CL also use an action key background for the emoji key only on
phone becase the emoji key share the same position with other action
keys. The emoji key on tablet keeps using the functional key
background.

Bug: 15296851
Change-Id: I7b8550c61f19548f463a782342bdc0f496433a2a
---
 java/res/xml-sw600dp/key_styles_enter.xml | 2 +-
 java/res/xml/key_styles_common.xml        | 2 +-
 java/res/xml/key_styles_enter.xml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml
index 742bb3ec3..55f00ef7d 100644
--- a/java/res/xml-sw600dp/key_styles_enter.xml
+++ b/java/res/xml-sw600dp/key_styles_enter.xml
@@ -102,7 +102,7 @@
         latin:keySpec="!icon/enter_key|!code/key_enter"
         latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor"
         latin:keyActionFlags="noKeyPreview"
-        latin:backgroundType="functional"
+        latin:backgroundType="action"
         latin:parentStyle="navigateMoreKeysStyle" />
     <switch>
         <!-- Shift + Enter in textMultiLine field. -->
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index 0a274e009..f4a48385c 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -82,7 +82,7 @@
         latin:styleName="emojiKeyStyle"
         latin:keySpec="!icon/emoji_key|!code/key_emoji"
         latin:keyActionFlags="noKeyPreview"
-        latin:backgroundType="functional" />
+        latin:backgroundType="action" />
     <include
         latin:keyboardLayout="@xml/key_styles_enter" />
     <key-style
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml
index 1d46dd523..1a60bcce8 100644
--- a/java/res/xml/key_styles_enter.xml
+++ b/java/res/xml/key_styles_enter.xml
@@ -257,7 +257,7 @@
         latin:styleName="defaultEnterKeyStyle"
         latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor"
         latin:keyActionFlags="noKeyPreview"
-        latin:backgroundType="functional"
+        latin:backgroundType="action"
         latin:parentStyle="navigateMoreKeysStyle" />
     <key-style
         latin:styleName="shiftEnterKeyStyle"