am d9e41aac: am 85b7b967: Merge "[HW12] Use the consumed status of the Event." into lmp-dev

* commit 'd9e41aac3fdf6e81ed7f2487cd9c74c28734a5e2':
  [HW12] Use the consumed status of the Event.

1 files changed, 4 insertions, 0 deletions

diff --git a/java/src/com/android/inputmethod/event/Event.java b/java/src/com/android/inputmethod/event/Event.java
index 98c827423..f02f7885a 100644
--- a/java/src/com/android/inputmethod/event/Event.java
+++ b/java/src/com/android/inputmethod/event/Event.java
@@ -227,6 +227,7 @@ public class Event {
      * @return an identical event marked as consumed.
      */
     public static Event createConsumedEvent(final Event source) {
+        // A consumed event should not input any text at all, so we pass the empty string as text.
         return new Event(source.mEventType, source.mText, source.mCodePoint, source.mKeyCode,
                 source.mX, source.mY, source.mSuggestedWordInfo, source.mFlags | FLAG_CONSUMED,
                 source.mNextEvent);
@@ -267,6 +268,9 @@ public class Event {
     }
 
     public CharSequence getTextToCommit() {
+        if (isConsumed()) {
+            return ""; // A consumed event should input no text.
+        }
         switch (mEventType) {
         case EVENT_TYPE_MODE_KEY:
         case EVENT_TYPE_NOT_HANDLED: