Merge "Shift+Smiley can register enter in textMultiLine field"

2012-02-29 01:42:29 -08:00 · 2012-02-29 01:42:29 -08:00 · 4dc9807f97
parent d9f6a0ebb7 9b764e0cc5
commit 4dc9807f97
1 changed files with 9 additions and 0 deletions
--- 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