am ddee4914: Merge "Move dictionary facilitator handling."

* commit 'ddee491450bd4447d1dcf102f472fe7038cbfb1d':
  Move dictionary facilitator handling.

2 files changed, 4 insertions, 6 deletions

diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java b/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java
index 74d863a4a..063bc89d0 100644
--- a/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java
+++ b/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java
@@ -34,11 +34,10 @@ public class StatsUtilsManager {
         return sInstance;
     }
 
-    public void onCreate(final Context context) {
+    public void onCreate(final Context context, final DictionaryFacilitator dictionaryFacilitator) {
     }
 
-    public void onLoadSettings(final Context context, final SettingsValues settingsValues,
-            final DictionaryFacilitator dictionaryFacilitator) {
+    public void onLoadSettings(final Context context, final SettingsValues settingsValues) {
     }
 
     public void onStartInputView() {
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 76d4a4a8d..f38b3330f 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -553,7 +553,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         KeyboardSwitcher.init(this);
         AudioAndHapticFeedbackManager.init(this);
         AccessibilityUtils.init(this);
-        mStatsUtilsManager.onCreate(this /* context */);
+        mStatsUtilsManager.onCreate(this /* context */, mDictionaryFacilitator);
         super.onCreate();
 
         mHandler.onCreate();
@@ -606,8 +606,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         }
         refreshPersonalizationDictionarySession(currentSettingsValues);
         resetDictionaryFacilitatorIfNecessary();
-        mStatsUtilsManager.onLoadSettings(this /* context */, currentSettingsValues,
-                mDictionaryFacilitator);
+        mStatsUtilsManager.onLoadSettings(this /* context */, currentSettingsValues);
     }
 
     private void refreshPersonalizationDictionarySession(