From 9127811493b9288a0ca385e75db68520b197dea2 Mon Sep 17 00:00:00 2001 From: Satoshi Kataoka Date: Wed, 8 Aug 2012 21:23:25 +0900 Subject: Pass traverse session Change-Id: I84bfaaa406e3f51421c08a7ee8f9576ebdba54d4 --- java/src/com/android/inputmethod/latin/BinaryDictionary.java | 9 +++++---- java/src/com/android/inputmethod/latin/DicTraverseSession.java | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'java/src') diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java index 7e6c53e2f..e0adc9a71 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java @@ -90,9 +90,9 @@ public class BinaryDictionary extends Dictionary { private native void closeNative(long dict); private native int getFrequencyNative(long dict, int[] word, int wordLength); private native boolean isValidBigramNative(long dict, int[] word1, int[] word2); - private native int getSuggestionsNative(long dict, long proximityInfo, int[] xCoordinates, - int[] yCoordinates, int[] times, int[] pointerIds, int[] inputCodes, int codesSize, - int commitPoint, boolean isGesture, + private native int getSuggestionsNative(long dict, long proximityInfo, long traverseSession, + int[] xCoordinates, int[] yCoordinates, int[] times, int[] pointerIds, + int[] inputCodes, int codesSize, int commitPoint, boolean isGesture, int[] prevWordCodePointArray, boolean useFullEditDistance, char[] outputChars, int[] outputScores, int[] outputIndices, int[] outputTypes); private static native float calcNormalizedScoreNative( @@ -129,7 +129,8 @@ public class BinaryDictionary extends Dictionary { final int codesSize = isGesture ? ips.getPointerSize() : composerSize; // proximityInfo and/or prevWordForBigrams may not be null. final int tmpCount = getSuggestionsNative(mNativeDict, - proximityInfo.getNativeProximityInfo(), ips.getXCoordinates(), + proximityInfo.getNativeProximityInfo(), + mDicTraverseSession.getSession(), ips.getXCoordinates(), ips.getYCoordinates(), ips.getTimes(), ips.getPointerIds(), mInputCodes, codesSize, 0 /* commitPoint */, isGesture, prevWordCodePointArray, mUseFullEditDistance, mOutputChars, mOutputScores, mSpaceIndices, mOutputTypes); diff --git a/java/src/com/android/inputmethod/latin/DicTraverseSession.java b/java/src/com/android/inputmethod/latin/DicTraverseSession.java index d0c70f3ad..ae68e69dd 100644 --- a/java/src/com/android/inputmethod/latin/DicTraverseSession.java +++ b/java/src/com/android/inputmethod/latin/DicTraverseSession.java @@ -30,6 +30,10 @@ public class DicTraverseSession { locale != null ? locale.toString() : ""); } + public long getSession() { + return mNativeDicTraverseSession; + } + private native long setDicTraverseSessionNative(String locale); private native void releaseDicTraverseSessionNative(long nativeDicTraverseSession); -- cgit v1.2.3-83-g751a