diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-08-05 13:25:59 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-08-05 13:25:59 +0000 |
| commit | c64769207d94c0b6515e7030a613c14bfc90ac3d (patch) | |
| tree | 4ad84e548346ed9efff1d4506ef299918d3f4c8e /java | |
| parent | 6745f337c166cb1750e80ce9101bdbf57d2b6596 (diff) | |
| parent | eceefd0725c4f727f44e9c65a82970ead15e3566 (diff) | |
| download | latinime-c64769207d94c0b6515e7030a613c14bfc90ac3d.tar.gz latinime-c64769207d94c0b6515e7030a613c14bfc90ac3d.tar.xz latinime-c64769207d94c0b6515e7030a613c14bfc90ac3d.zip | |
am eceefd07: am 689064d0: Remove unnecessarily overridden defaultEnterKeyStyle
* commit 'eceefd0725c4f727f44e9c65a82970ead15e3566':
Remove unnecessarily overridden defaultEnterKeyStyle
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml/key_styles_enter.xml | 1 | ||||
| -rw-r--r-- | java/res/xml/key_styles_number.xml | 8 |
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> |