diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-02-23 00:13:27 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-02-23 00:13:27 +0000 |
| commit | 8f794c72db07786c866e357c7853c339882b45ef (patch) | |
| tree | 8ce04710dc0088b3a82d0f5f293db58b0fdf51ef /java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java | |
| parent | 97a5246f7661be4d25e3dd905fd4de476e872bf0 (diff) | |
| parent | 4e4f88127b6a75302fac3a004e41fff1899a773f (diff) | |
| download | latinime-8f794c72db07786c866e357c7853c339882b45ef.tar.gz latinime-8f794c72db07786c866e357c7853c339882b45ef.tar.xz latinime-8f794c72db07786c866e357c7853c339882b45ef.zip | |
Merge "Fix how the Enter action is decided"
Diffstat (limited to 'java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java')
| -rw-r--r-- | java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java b/java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java index a2463c20c..720d07433 100644 --- a/java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java +++ b/java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java @@ -58,11 +58,11 @@ public class HardwareKeyboardEventDecoder implements HardwareEventDecoder { } if (KeyEvent.KEYCODE_ENTER == keyCode) { // The Enter key. If the Shift key is not being pressed, this should send a - // CODE_ACTION_ENTER to trigger the action if any, or a carriage return - // otherwise. If the Shift key is depressed, this should send a - // CODE_SHIFT_ENTER and let Latin IME decide what to do with it. + // CODE_ENTER to trigger the action if any, or a carriage return otherwise. If the + // Shift key is being pressed, this should send a CODE_SHIFT_ENTER and let + // Latin IME decide what to do with it. return Event.createCommittableEvent(keyEvent.isShiftPressed() - ? Constants.CODE_SHIFT_ENTER : Constants.CODE_ACTION_ENTER, + ? Constants.CODE_SHIFT_ENTER : Constants.CODE_ENTER, null /* next */); } // If not Enter, then we have a committable character. This should be committed |