From 92db209c60f82dee19e2c684ef58093817bf8bba Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Wed, 12 Mar 2014 16:08:21 +0900 Subject: [CB01] Reset some old assumptions about dead keys The combining framework will be more generic than previously thought. We don't need to handle dead keys as a special type of event, as all events can be combined arbitrarily. Bug: 13406701 Change-Id: I8137fdb186c4d70eaa71808c5a1430b1559db1ae --- java/src/com/android/inputmethod/event/DeadKeyCombiner.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'java/src/com/android/inputmethod/event/DeadKeyCombiner.java') diff --git a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java b/java/src/com/android/inputmethod/event/DeadKeyCombiner.java index 52987d571..4af459028 100644 --- a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java +++ b/java/src/com/android/inputmethod/event/DeadKeyCombiner.java @@ -43,19 +43,19 @@ public class DeadKeyCombiner implements Combiner { final int resultingCodePoint = KeyCharacterMap.getDeadChar(deadCodePoint, event.mCodePoint); if (0 == resultingCodePoint) { - // We can't combine both characters. We need to commit the dead key as a committable + // We can't combine both characters. We need to commit the dead key as a separate // character, and the next char too unless it's a space (because as a special case, // dead key + space should result in only the dead key being committed - that's // how dead keys work). // If the event is a space, we should commit the dead char alone, but if it's // not, we need to commit both. - return Event.createCommittableEvent(deadCodePoint, + return Event.createInputKeypressEvent(deadCodePoint, event.mKeyCode, Constants.CODE_SPACE == event.mCodePoint ? null : event /* next */); } else { // We could combine the characters. - return Event.createCommittableEvent(resultingCodePoint, null /* next */); + return Event.createInputKeypressEvent(resultingCodePoint, event.mKeyCode, + null /* next */); } } } - } -- cgit v1.2.3-83-g751a