From 067d8cdf56580c6aaf0fd98ff8f7b6bf837a8814 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Fri, 24 Oct 2014 16:21:53 +0900 Subject: Fix unit test breakage Change-Id: I538288054a58eb2c81ce3cbe5c9bef900fb653a5 --- .../src/com/android/inputmethod/event/DeadKeyCombiner.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'java/src') diff --git a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java b/java/src/com/android/inputmethod/event/DeadKeyCombiner.java index a3e4ad833..1a28bb1d5 100644 --- a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java +++ b/java/src/com/android/inputmethod/event/DeadKeyCombiner.java @@ -218,17 +218,17 @@ public class DeadKeyCombiner implements Combiner { @Nonnull private static Event createEventChainFromSequence(final @Nonnull CharSequence text, @Nonnull final Event originalEvent) { - if (text.length() <= 0) { + int index = text.length(); + if (index <= 0) { return originalEvent; } Event lastEvent = null; - int codePoint = 0; - for (int i = text.length(); i > 0; i -= Character.charCount(codePoint)) { - codePoint = Character.codePointBefore(text, i); - final Event thisEvent = Event.createHardwareKeypressEvent(codePoint, + do { + final int codePoint = Character.codePointBefore(text, index); + lastEvent = Event.createHardwareKeypressEvent(codePoint, originalEvent.mKeyCode, lastEvent, false /* isKeyRepeat */); - lastEvent = thisEvent; - } + index -= Character.charCount(codePoint); + } while (index > 0); return lastEvent; } -- cgit v1.2.3-83-g751a