am 2e680c89: Merge "Trigger the set action when pressing hardware enter (C2)"
* commit '2e680c890d198f2f32d4ae1a46b0431b61227db2': Trigger the set action when pressing hardware enter (C2)main
commit
b416d7e58d
|
@ -55,13 +55,20 @@ public class HardwareKeyboardEventDecoder implements HardwareEventDecoder {
|
||||||
// A dead key.
|
// A dead key.
|
||||||
return Event.createDeadEvent(
|
return Event.createDeadEvent(
|
||||||
codePointAndFlags & KeyCharacterMap.COMBINING_ACCENT_MASK, null /* next */);
|
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 {
|
if (KeyEvent.KEYCODE_ENTER == keyCode) {
|
||||||
return Event.createNotHandledEvent();
|
// 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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue