aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/event/Combiner.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-07-29 13:32:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-29 13:32:03 +0000
commit6bc87b96ce25887bb8bfe561308a65204152c577 (patch)
treefedb8aa316f7383304192b1bbb51fb9ab3bd8b1e /java/src/com/android/inputmethod/event/Combiner.java
parent8c6778f9ca6c09fa1034168ae13b68cea93f9420 (diff)
parent8c932cbd0a9563d03e914051e6447728875e6c2b (diff)
downloadlatinime-6bc87b96ce25887bb8bfe561308a65204152c577.tar.gz
latinime-6bc87b96ce25887bb8bfe561308a65204152c577.tar.xz
latinime-6bc87b96ce25887bb8bfe561308a65204152c577.zip
am 8c932cbd: am 3c7cb523: Merge "[HW7.5] Introduce the @Nonnull annotation" into lmp-dev
* commit '8c932cbd0a9563d03e914051e6447728875e6c2b': [HW7.5] Introduce the @Nonnull annotation
Diffstat (limited to 'java/src/com/android/inputmethod/event/Combiner.java')
-rw-r--r--java/src/com/android/inputmethod/event/Combiner.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/event/Combiner.java b/java/src/com/android/inputmethod/event/Combiner.java
index 8b808c6b3..fee93f0c6 100644
--- a/java/src/com/android/inputmethod/event/Combiner.java
+++ b/java/src/com/android/inputmethod/event/Combiner.java
@@ -18,6 +18,8 @@ package com.android.inputmethod.event;
import java.util.ArrayList;
+import javax.annotation.Nonnull;
+
/**
* A generic interface for combiners. Combiners are objects that transform chains of input events
* into committable strings and manage feedback to show to the user on the combining state.
@@ -33,6 +35,7 @@ public interface Combiner {
* @param event the event to combine with the existing state.
* @return the resulting event.
*/
+ @Nonnull
Event processEvent(ArrayList<Event> previousEvents, Event event);
/**