From 8e38b12e9ccc48bcb18b2eeec4d53d19cf7a29c9 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Tue, 1 Jul 2014 13:07:47 +0900
Subject: [HW7] Introduce consumed events

Change-Id: I692c35b8e701d5a84500b949884472545b1f424d
---
 java/src/com/android/inputmethod/event/DeadKeyCombiner.java | 3 +--
 1 file changed, 1 insertion(+), 2 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 bef4d8594..342f499c9 100644
--- a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java
+++ b/java/src/com/android/inputmethod/event/DeadKeyCombiner.java
@@ -32,12 +32,11 @@ 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;
+            return Event.createConsumedEvent(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.
-- 
cgit v1.2.3-83-g751a