diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-07-08 16:36:06 +0900 |
|---|---|---|
| committer | Keisuke Kuroyanagi <ksk@google.com> | 2014-07-08 16:36:06 +0900 |
| commit | b8a9479b57007edb5cb12c628797f89a8164f596 (patch) | |
| tree | 1f44a3e0f7a53538cdb94ddb11d8a7c52c221af2 /java/src/com/android/inputmethod/latin/BinaryDictionary.java | |
| parent | c495c5bdcb3c1d52c8bb6652df9cdbfd5416788f (diff) | |
| download | latinime-b8a9479b57007edb5cb12c628797f89a8164f596.tar.gz latinime-b8a9479b57007edb5cb12c628797f89a8164f596.tar.xz latinime-b8a9479b57007edb5cb12c628797f89a8164f596.zip | |
Move phrase gesture from additional features to public.
Bug: 15758242
Change-Id: I703dc2703afdf9402c5d2ac27411b74ece993dba
Diffstat (limited to 'java/src/com/android/inputmethod/latin/BinaryDictionary.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/BinaryDictionary.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java index 1b5791809..c799ac745 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java @@ -28,6 +28,7 @@ import com.android.inputmethod.latin.makedict.FormatSpec; import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions; import com.android.inputmethod.latin.makedict.UnsupportedFormatException; import com.android.inputmethod.latin.makedict.WordProperty; +import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion; import com.android.inputmethod.latin.utils.BinaryDictionaryUtils; import com.android.inputmethod.latin.utils.FileUtils; import com.android.inputmethod.latin.utils.JniUtils; @@ -256,7 +257,7 @@ public final class BinaryDictionary extends Dictionary { @Override public ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer composer, final PrevWordsInfo prevWordsInfo, final ProximityInfo proximityInfo, - final boolean blockOffensiveWords, final int[] additionalFeaturesOptions, + final SettingsValuesForSuggestion settingsValuesForSuggestion, final int sessionId, final float[] inOutLanguageWeight) { if (!isValidDictionary()) { return null; @@ -279,8 +280,12 @@ public final class BinaryDictionary extends Dictionary { } session.mNativeSuggestOptions.setUseFullEditDistance(mUseFullEditDistance); session.mNativeSuggestOptions.setIsGesture(isGesture); - session.mNativeSuggestOptions.setBlockOffensiveWords(blockOffensiveWords); - session.mNativeSuggestOptions.setAdditionalFeaturesOptions(additionalFeaturesOptions); + session.mNativeSuggestOptions.setBlockOffensiveWords( + settingsValuesForSuggestion.mBlockPotentiallyOffensive); + session.mNativeSuggestOptions.setSpaceAwareGestureEnabled( + settingsValuesForSuggestion.mSpaceAwareGestureEnabled); + session.mNativeSuggestOptions.setAdditionalFeaturesOptions( + settingsValuesForSuggestion.mAdditionalFeaturesSettingValues); if (inOutLanguageWeight != null) { session.mInputOutputLanguageWeight[0] = inOutLanguageWeight[0]; } else { |