diff options
| author |   Mohammadinamul Sheik <inamul@google.com> | 2015-02-05 02:10:56 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-02-05 02:10:56 +0000 |
| commit | 124039cfe1c10721a36ea31c01ec3a8a3fa93c49 (patch) | |
| tree | a66a91b32a838f782d059b5f0b8b871e9bd58c57 /java/src/com/android/inputmethod/latin/inputlogic | |
| parent | baf0bd90a3497afc665d23c8ebe1592278ab9699 (diff) | |
| parent | bae6848434c0618887bd3fd441dd5ce16a2375fd (diff) | |
| download | latinime-124039cfe1c10721a36ea31c01ec3a8a3fa93c49.tar.gz latinime-124039cfe1c10721a36ea31c01ec3a8a3fa93c49.tar.xz latinime-124039cfe1c10721a36ea31c01ec3a8a3fa93c49.zip | |
am bae68484: Merge "AOSP changes to use KeyboardLayout to support the new DictionaryFacilitator"
* commit 'bae6848434c0618887bd3fd441dd5ce16a2375fd':
AOSP changes to use KeyboardLayout to support the new DictionaryFacilitator
Diffstat (limited to 'java/src/com/android/inputmethod/latin/inputlogic')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java index 18927ce85..12c384d69 100644 --- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java +++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java @@ -32,6 +32,7 @@ import android.view.inputmethod.EditorInfo; import com.android.inputmethod.compat.SuggestionSpanUtils; import com.android.inputmethod.event.Event; import com.android.inputmethod.event.InputTransaction; +import com.android.inputmethod.keyboard.KeyboardLayout; import com.android.inputmethod.keyboard.KeyboardSwitcher; import com.android.inputmethod.keyboard.ProximityInfo; import com.android.inputmethod.latin.Dictionary; @@ -2115,7 +2116,8 @@ public final class InputLogic { public void getSuggestedWords(final SettingsValues settingsValues, final ProximityInfo proximityInfo, final int keyboardShiftMode, final int inputStyle, - final int sequenceNumber, final OnGetSuggestedWordsCallback callback) { + final int sequenceNumber, final OnGetSuggestedWordsCallback callback, + final KeyboardLayout keyboardLayout) { mWordComposer.adviseCapitalizedModeBeforeFetchingSuggestions( getActualCapsMode(settingsValues, keyboardShiftMode)); mSuggest.getSuggestedWords(mWordComposer, @@ -2129,7 +2131,7 @@ public final class InputLogic { new SettingsValuesForSuggestion(settingsValues.mBlockPotentiallyOffensive, settingsValues.mPhraseGestureEnabled), settingsValues.mAutoCorrectionEnabledPerUserSettings, - inputStyle, sequenceNumber, callback); + inputStyle, sequenceNumber, callback, keyboardLayout); } /** |