aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-02-29 01:42:29 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-29 01:42:29 -0800
commit4dc9807f97e0d1d2500bb55c3257437027013adc (patch)
tree21aef6bc04cffbceaa153c0395684d59be787ff9 /java
parentd9f6a0ebb7aba7e5047034bcd92b9e5028fbc830 (diff)
parent9b764e0cc502b2f3cb8a50c2158eede74dabd9fc (diff)
downloadlatinime-4dc9807f97e0d1d2500bb55c3257437027013adc.tar.gz
latinime-4dc9807f97e0d1d2500bb55c3257437027013adc.tar.xz
latinime-4dc9807f97e0d1d2500bb55c3257437027013adc.zip
Merge "Shift+Smiley can register enter in textMultiLine field"
Diffstat (limited to 'java')
-rw-r--r--java/res/xml/key_styles_common.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index f0ea8ce5a..76eacb673 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -79,6 +79,15 @@
<include
latin:keyboardLayout="@xml/key_styles_enter" />
<switch>
+ <!-- Shift + Enter in textMultiLine field. -->
+ <case
+ latin:isMultiLine="true"
+ latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:parentStyle="defaultEnterKeyStyle" />
+ </case>
<!-- Smiley in textShortMessage field.
Overrides common enter key style. -->
<case