am 689064d0: Remove unnecessarily overridden defaultEnterKeyStyle

* commit '689064d0a26a7d551c49b53bf43d0eeab0f28379':
  Remove unnecessarily overridden defaultEnterKeyStyle
This commit is contained in:
Tadashi G. Takaoka 2014-08-05 13:19:38 +00:00 committed by Android Git Automerger
commit eceefd0725
2 changed files with 1 additions and 8 deletions

View file

@ -255,6 +255,7 @@
<!-- Enter key style --> <!-- Enter key style -->
<key-style <key-style
latin:styleName="defaultEnterKeyStyle" latin:styleName="defaultEnterKeyStyle"
latin:keySpec="!icon/enter_key|!code/key_enter"
latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor" latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor"
latin:keyActionFlags="noKeyPreview" latin:keyActionFlags="noKeyPreview"
latin:backgroundType="action" latin:backgroundType="action"

View file

@ -122,12 +122,4 @@
latin:keySpec="!icon/space_key_for_number_layout|!code/key_space" latin:keySpec="!icon/space_key_for_number_layout|!code/key_space"
latin:keyActionFlags="enableLongPress" latin:keyActionFlags="enableLongPress"
latin:parentStyle="numKeyBaseStyle" /> 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> </merge>