nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 2e680c89: Merge "Trigger the set action when pressing hardware enter (C2)" 

* commit '2e680c890d198f2f32d4ae1a46b0431b61227db2':
  Trigger the set action when pressing hardware enter (C2)
main
Jean Chalard 2013-01-18 03:20:34 -08:00 committed by Android Git Automerger
parent db31867678 2e680c890d
commit b416d7e58d
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java
View File

@ -55,13 +55,20 @@ public class HardwareKeyboardEventDecoder implements HardwareEventDecoder {
// A dead key.
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, null /* next */);
}
} else {
return Event.createNotHandledEvent();
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.
return Event.createCommittableEvent(keyEvent.isShiftPressed()
? Constants.CODE_SHIFT_ENTER : Constants.CODE_ACTION_ENTER,
null /* next */);
}
// If not Enter, then we have a committable character. This should be committed
// right away, taking into account the current state.
return Event.createCommittableEvent(codePointAndFlags, null /* next */);
}
return Event.createNotHandledEvent();
}
}