From f2bb15b0ab212e1ef45be2d2ea6610cfa9c9f15c Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Tue, 18 Mar 2014 11:09:41 +0900 Subject: [CB09] Pass events through the combiner chain Bug: 13406701 Change-Id: I4696f145478afdd132314b7d3c148c3a9ca11c9c --- java/src/com/android/inputmethod/event/DeadKeyCombiner.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (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 ae8639713..f77ce6347 100644 --- a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java +++ b/java/src/com/android/inputmethod/event/DeadKeyCombiner.java @@ -21,14 +21,17 @@ import android.view.KeyCharacterMap; import com.android.inputmethod.latin.Constants; +import java.util.ArrayList; + /** * A combiner that handles dead keys. */ public class DeadKeyCombiner implements Combiner { + // TODO: make this a list of events instead final StringBuilder mDeadSequence = new StringBuilder(); @Override - public Event combine(final Event event) { + public Event processEvent(final ArrayList previousEvents, final Event event) { if (null == event) return null; // Just in case some combiner is broken if (TextUtils.isEmpty(mDeadSequence)) { if (event.isDead()) { -- cgit v1.2.3-83-g751a