2 files changed, 13 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/DicTraverseSession.java b/java/src/com/android/inputmethod/latin/DicTraverseSession.java
index ae68e69dd..437876e05 100644
--- a/java/src/com/android/inputmethod/latin/DicTraverseSession.java
+++ b/java/src/com/android/inputmethod/latin/DicTraverseSession.java
@@ -22,20 +22,30 @@ public class DicTraverseSession {
     static {
         JniUtils.loadNativeLibrary();
     }
+    private native long setDicTraverseSessionNative(String locale);
+    private native void initDicTraverseSessionNative(
+            long nativeDicTraverseSession, int[] previousWord, int previwousWordLength);
+    private native void releaseDicTraverseSessionNative(long nativeDicTraverseSession);
 
     private long mNativeDicTraverseSession;
 
     public DicTraverseSession(Locale locale) {
         mNativeDicTraverseSession = createNativeDicTraverseSession(
                 locale != null ? locale.toString() : "");
+        initSession();
     }
 
     public long getSession() {
         return mNativeDicTraverseSession;
     }
 
-    private native long setDicTraverseSessionNative(String locale);
-    private native void releaseDicTraverseSessionNative(long nativeDicTraverseSession);
+    public void initSession() {
+        initSession(null, 0);
+    }
+
+    public void initSession(int[] previousWord, int previousWordLength) {
+        initDicTraverseSessionNative(mNativeDicTraverseSession, previousWord, previousWordLength);
+    }
 
     private final long createNativeDicTraverseSession(String locale) {
         return setDicTraverseSessionNative(locale);
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 894b69b79..e0dbb8e6e 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -722,6 +722,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         mHandler.cancelUpdateSuggestionStrip();
         mHandler.cancelDoubleSpacesTimer();
 
+        mainKeyboardView.setMainDictionaryAvailability(mIsMainDictionaryAvailable);
         mainKeyboardView.setKeyPreviewPopupEnabled(mCurrentSettings.mKeyPreviewPopupOn,
                 mCurrentSettings.mKeyPreviewPopupDismissDelay);
         mainKeyboardView.setGestureHandlingEnabledByUser(mCurrentSettings.mGestureInputEnabled);