nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 536bf616: Merge "Remove dicttool dependency to NativeSuggestOptions" 

* commit '536bf61658fbd1f541824f6020493dc8816c8349':
  Remove dicttool dependency to NativeSuggestOptions
main
Jean Chalard 2014-11-07 06:03:33 +00:00 committed by Android Git Automerger
parent c5aefe7d7b 536bf61658
commit c1fefd2018
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/latin/settings/NativeSuggestOptions.java → common/src/com/android/inputmethod/latin/common/NativeSuggestOptions.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.inputmethod.latin.settings; package com.android.inputmethod.latin.common;
public class NativeSuggestOptions { public class NativeSuggestOptions {
// Need to update suggest_options.h when you add, remove or reorder options. // Need to update suggest_options.h when you add, remove or reorder options.
@ -25,8 +25,11 @@ public class NativeSuggestOptions {
private static final int WEIGHT_FOR_LOCALE_IN_THOUSANDS = 4; private static final int WEIGHT_FOR_LOCALE_IN_THOUSANDS = 4;
private static final int OPTIONS_SIZE = 5; private static final int OPTIONS_SIZE = 5;
private final int[] mOptions = new int[OPTIONS_SIZE private final int[] mOptions;
+ AdditionalFeaturesSettingUtils.ADDITIONAL_FEATURES_SETTINGS_SIZE];
public NativeSuggestOptions(final int additionalFeaturesSettingsSize) {
mOptions = new int[additionalFeaturesSettingsSize];
}
public void setIsGesture(final boolean value) { public void setIsGesture(final boolean value) {
setBooleanOption(IS_GESTURE, value); setBooleanOption(IS_GESTURE, value);

6
java/src/com/android/inputmethod/latin/DicTraverseSession.java
View File

@ -17,7 +17,8 @@
package com.android.inputmethod.latin; package com.android.inputmethod.latin;
import com.android.inputmethod.latin.common.Constants; import com.android.inputmethod.latin.common.Constants;
import com.android.inputmethod.latin.settings.NativeSuggestOptions; import com.android.inputmethod.latin.common.NativeSuggestOptions;
import com.android.inputmethod.latin.settings.AdditionalFeaturesSettingUtils;
import com.android.inputmethod.latin.utils.JniUtils; import com.android.inputmethod.latin.utils.JniUtils;
import java.util.Locale; import java.util.Locale;
@ -43,7 +44,8 @@ public final class DicTraverseSession {
public final int[] mOutputAutoCommitFirstWordConfidence = new int[1]; public final int[] mOutputAutoCommitFirstWordConfidence = new int[1];
public final float[] mInputOutputWeightOfLangModelVsSpatialModel = new float[1]; public final float[] mInputOutputWeightOfLangModelVsSpatialModel = new float[1];
public final NativeSuggestOptions mNativeSuggestOptions = new NativeSuggestOptions(); public final NativeSuggestOptions mNativeSuggestOptions = new NativeSuggestOptions(
AdditionalFeaturesSettingUtils.ADDITIONAL_FEATURES_SETTINGS_SIZE);
private static native long setDicTraverseSessionNative(String locale, long dictSize); private static native long setDicTraverseSessionNative(String locale, long dictSize);
private static native void initDicTraverseSessionNative(long nativeDicTraverseSession, private static native void initDicTraverseSessionNative(long nativeDicTraverseSession,

1
tools/dicttool/Android.mk
View File

@ -47,7 +47,6 @@ LATINIME_SRC_FILES_FOR_DICTTOOL := \
latin/Dictionary.java \ latin/Dictionary.java \
latin/NgramContext.java \ latin/NgramContext.java \
latin/SuggestedWords.java \ latin/SuggestedWords.java \
latin/settings/NativeSuggestOptions.java \
latin/settings/SettingsValuesForSuggestion.java \ latin/settings/SettingsValuesForSuggestion.java \
latin/utils/BinaryDictionaryUtils.java \ latin/utils/BinaryDictionaryUtils.java \
latin/utils/CombinedFormatUtils.java \ latin/utils/CombinedFormatUtils.java \