Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03eb9de9 authored by Jean Chalard's avatar Jean Chalard
Browse files

Remove dicttool dependency to NativeSuggestOptions 

Bug: 18108776
Change-Id: I0f57594617f8d5080aea9002b2356d18bfe97043
parent 5564317f

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

+6 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.inputmethod.latin.settings;

package com.android.inputmethod.latin.common;



public class NativeSuggestOptions {

    // 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 OPTIONS_SIZE = 5;



    private final int[] mOptions = new int[OPTIONS_SIZE

            + AdditionalFeaturesSettingUtils.ADDITIONAL_FEATURES_SETTINGS_SIZE];

    private final int[] mOptions;



    public NativeSuggestOptions(final int additionalFeaturesSettingsSize) {

        mOptions = new int[additionalFeaturesSettingsSize];

    }



    public void setIsGesture(final boolean value) {

        setBooleanOption(IS_GESTURE, value);

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

+4 −2
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
package com.android.inputmethod.latin;



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 java.util.Locale;
@@ -43,7 +44,8 @@ public final class DicTraverseSession { 
    public final int[] mOutputAutoCommitFirstWordConfidence = new int[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 void initDicTraverseSessionNative(long nativeDicTraverseSession,

tools/dicttool/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ LATINIME_SRC_FILES_FOR_DICTTOOL := \ 
        latin/Dictionary.java \

        latin/NgramContext.java \

        latin/SuggestedWords.java \

        latin/settings/NativeSuggestOptions.java \

        latin/settings/SettingsValuesForSuggestion.java \

        latin/utils/BinaryDictionaryUtils.java \

        latin/utils/CombinedFormatUtils.java \