aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-08-05 13:19:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-05 13:19:38 +0000
commiteceefd0725c4f727f44e9c65a82970ead15e3566 (patch)
tree87c46852eb696b748563b1731c7e4a0b5a19003f /java
parentd5c89d64901f1fe7085e6c217d0c2fc19853b032 (diff)
parent689064d0a26a7d551c49b53bf43d0eeab0f28379 (diff)
downloadlatinime-eceefd0725c4f727f44e9c65a82970ead15e3566.tar.gz
latinime-eceefd0725c4f727f44e9c65a82970ead15e3566.tar.xz
latinime-eceefd0725c4f727f44e9c65a82970ead15e3566.zip
am 689064d0: Remove unnecessarily overridden defaultEnterKeyStyle
* commit '689064d0a26a7d551c49b53bf43d0eeab0f28379': Remove unnecessarily overridden defaultEnterKeyStyle
Diffstat (limited to 'java')
-rw-r--r--java/res/xml/key_styles_enter.xml1
-rw-r--r--java/res/xml/key_styles_number.xml8
2 files changed, 1 insertions, 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>