aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-01-09 22:23:59 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-09 22:23:59 -0800
commit5866ef99f549ae67edd80a90e8528c5a6799b5b4 (patch)
tree2a0d42a92ccff0e38a3c71cafb9723be78ca7cee /java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java
parent41f31d78139beccecf17c290776cc5f47430e38f (diff)
parent424d76fbf59bea5f96694a31918568a7479b89be (diff)
downloadlatinime-5866ef99f549ae67edd80a90e8528c5a6799b5b4.tar.gz
latinime-5866ef99f549ae67edd80a90e8528c5a6799b5b4.tar.xz
latinime-5866ef99f549ae67edd80a90e8528c5a6799b5b4.zip
am 424d76fb: Merge "Add a next Event (B2)"
* commit '424d76fbf59bea5f96694a31918568a7479b89be': Add a next Event (B2)
Diffstat (limited to 'java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java')
-rw-r--r--java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java b/java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java
index 554319e51..2fb7fe8b4 100644
--- a/java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java
+++ b/java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java
@@ -47,17 +47,18 @@ public class HardwareKeyboardEventDecoder implements HardwareEventDecoder {
// the key for 'A' or Space, but also Backspace or Ctrl or Caps Lock.
final int keyCode = keyEvent.getKeyCode();
if (KeyEvent.KEYCODE_DEL == keyCode) {
- return Event.createCommittableEvent(Constants.CODE_DELETE);
+ return Event.createCommittableEvent(Constants.CODE_DELETE, null /* next */);
}
if (keyEvent.isPrintingKey() || KeyEvent.KEYCODE_SPACE == keyCode
|| KeyEvent.KEYCODE_ENTER == keyCode) {
if (0 != (codePointAndFlags & KeyCharacterMap.COMBINING_ACCENT)) {
// A dead key.
- return Event.createDeadEvent(codePointAndFlags & KeyCharacterMap.COMBINING_ACCENT_MASK);
+ return Event.createDeadEvent(
+ codePointAndFlags & KeyCharacterMap.COMBINING_ACCENT_MASK, null /* next */);
} else {
// A committable character. This should be committed right away, taking into
// account the current state.
- return Event.createCommittableEvent(codePointAndFlags);
+ return Event.createCommittableEvent(codePointAndFlags, null /* next */);
}
} else {
return Event.createNotHandledEvent();