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

@@ -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"

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>