diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-07-30 16:57:55 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-30 16:57:55 +0000 |
| commit | 55387ba41731460a412fe4f39c081ff9f6a550f2 (patch) | |
| tree | c94b36fa4c4708e878d34890909bd014f1847144 /java/src/com/android/inputmethod/event/DeadKeyCombiner.java | |
| parent | cbffc447e741876d13230097064642208aca6e69 (diff) | |
| parent | 9fbeeb609f85d962e28f51c4b582601ef4a5cae9 (diff) | |
| download | latinime-55387ba41731460a412fe4f39c081ff9f6a550f2.tar.gz latinime-55387ba41731460a412fe4f39c081ff9f6a550f2.tar.xz latinime-55387ba41731460a412fe4f39c081ff9f6a550f2.zip | |
am 9fbeeb60: Merge "Revert "[HW7] Introduce consumed events"" into lmp-dev
* commit '9fbeeb609f85d962e28f51c4b582601ef4a5cae9':
Revert "[HW7] Introduce consumed events"
Diffstat (limited to 'java/src/com/android/inputmethod/event/DeadKeyCombiner.java')
| -rw-r--r-- | java/src/com/android/inputmethod/event/DeadKeyCombiner.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java b/java/src/com/android/inputmethod/event/DeadKeyCombiner.java index 342f499c9..bef4d8594 100644 --- a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java +++ b/java/src/com/android/inputmethod/event/DeadKeyCombiner.java @@ -32,11 +32,12 @@ public class DeadKeyCombiner implements Combiner { @Override public Event processEvent(final ArrayList<Event> previousEvents, final Event event) { + if (null == event) return null; // Just in case some combiner is broken if (TextUtils.isEmpty(mDeadSequence)) { if (event.isDead()) { mDeadSequence.appendCodePoint(event.mCodePoint); } - return Event.createConsumedEvent(event); + return event; } else { // TODO: Allow combining for several dead chars rather than only the first one. // The framework doesn't know how to do this now. |