commit 6e86632311a24af90ad35c98224ae25f226c1954
author David Faden <dfaden@google.com> Thu Mar 19 13:30:43 2015 -0700
committer David Faden <dfaden@google.com> Thu Mar 19 18:23:35 2015 -0700
tree 23f178aee97023ff5bad2ebe76e427338a246a69
parent 7df95c54fa9edd4a9fc9c267b204640299b7bad6

Pass DictionaryFacilitator to GestureConsumer#onImeSuggestionsProcessed.

Bug: 19712589
Change-Id: I81f9bf09b37487450780d85a1e4f752a9ba49370

java-overridable/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java

diff --git a/java-overridable/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java b/java-overridable/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java
index 7a5d2e6..8291b4f 100644
--- a/java-overridable/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java
+++ b/java-overridable/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java
@@ -19,6 +19,7 @@
 import android.view.inputmethod.EditorInfo;
 
 import com.android.inputmethod.keyboard.Keyboard;
+import com.android.inputmethod.latin.DictionaryFacilitator;
 import com.android.inputmethod.latin.SuggestedWords;
 import com.android.inputmethod.latin.common.InputPointers;
 import com.android.inputmethod.latin.inputlogic.PrivateCommandPerformer;
@@ -62,6 +63,7 @@
     }
 
     public void onImeSuggestionsProcessed(final SuggestedWords suggestedWords,
-            final int composingStart, final int composingLength) {
+            final int composingStart, final int composingLength,
+            final DictionaryFacilitator dictionaryFacilitator) {
     }
 }

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index a8aeb87..71dc30b 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1407,7 +1407,8 @@
      */
     public void onTailBatchInputResultShown(final SuggestedWords suggestedWords) {
         mGestureConsumer.onImeSuggestionsProcessed(suggestedWords,
-                mInputLogic.getComposingStart(), mInputLogic.getComposingLength());
+                mInputLogic.getComposingStart(), mInputLogic.getComposingLength(),
+                mDictionaryFacilitator);
     }
 
     // This method must run on the UI Thread.

tests/src/com/android/inputmethod/latin/touchinputconsumer/NullGestureConsumerTests.java

diff --git a/tests/src/com/android/inputmethod/latin/touchinputconsumer/NullGestureConsumerTests.java b/tests/src/com/android/inputmethod/latin/touchinputconsumer/NullGestureConsumerTests.java
index ca1039b..ad6bcc3 100644
--- a/tests/src/com/android/inputmethod/latin/touchinputconsumer/NullGestureConsumerTests.java
+++ b/tests/src/com/android/inputmethod/latin/touchinputconsumer/NullGestureConsumerTests.java
@@ -34,7 +34,7 @@
         GestureConsumer.NULL_GESTURE_CONSUMER.onGestureStarted(null, null);
         GestureConsumer.NULL_GESTURE_CONSUMER.onGestureCanceled();
         GestureConsumer.NULL_GESTURE_CONSUMER.onGestureCompleted(null);
-        GestureConsumer.NULL_GESTURE_CONSUMER.onImeSuggestionsProcessed(null, -1, -1);
+        GestureConsumer.NULL_GESTURE_CONSUMER.onImeSuggestionsProcessed(null, -1, -1, null);
     }
 
     /**