From 689064d0a26a7d551c49b53bf43d0eeab0f28379 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 5 Aug 2014 18:43:06 +0900
Subject: [PATCH] Remove unnecessarily overridden defaultEnterKeyStyle

The overriding defaultEnterKeyStyle was needed because there were two
Key's attributes to control key's visual, keyLabel and
keyIcon. Because these were merged into one keySpec attribute, there
is no need to override defaultEnterKeyStyle.

Bug: 16787857
Change-Id: I78ca2c7c9349e4532c67e8d6468a5b98309adc05
---
 java/res/xml/key_styles_enter.xml  | 1 +
 java/res/xml/key_styles_number.xml | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml
index 50530e1bf..770bf3876 100644
--- a/java/res/xml/key_styles_enter.xml
+++ b/java/res/xml/key_styles_enter.xml
@@ -255,6 +255,7 @@
     <!-- Enter key style -->
     <key-style
         latin:styleName="defaultEnterKeyStyle"
+        latin:keySpec="!icon/enter_key|!code/key_enter"
         latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor"
         latin:keyActionFlags="noKeyPreview"
         latin:backgroundType="action"
diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml
index df4448c25..f754b99b3 100644
--- a/java/res/xml/key_styles_number.xml
+++ b/java/res/xml/key_styles_number.xml
@@ -122,12 +122,4 @@
         latin:keySpec="!icon/space_key_for_number_layout|!code/key_space"
         latin:keyActionFlags="enableLongPress"
         latin:parentStyle="numKeyBaseStyle" />
-    <!-- Override defaultEnterKeyStyle in key_styles_enter.xml -->
-    <key-style
-        latin:styleName="defaultEnterKeyStyle"
-        latin:keySpec="!icon/enter_key|!code/key_enter"
-        latin:keyLabelFlags="preserveCase|autoXScale|followKeyLargeLabelRatio"
-        latin:keyActionFlags="noKeyPreview"
-        latin:backgroundType="functional"
-        latin:parentStyle="navigateMoreKeysStyle" />
 </merge>