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/spellcheck/AndroidSpellCheckerService.java | |
| 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/spellcheck/AndroidSpellCheckerService.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java index 8744020b1..7851dd287 100644 --- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java +++ b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java @@ -27,6 +27,7 @@ import android.view.textservice.SuggestionsInfo; import com.android.inputmethod.keyboard.Keyboard; import com.android.inputmethod.keyboard.KeyboardId; +import com.android.inputmethod.keyboard.KeyboardLayout; import com.android.inputmethod.keyboard.KeyboardLayoutSet; import com.android.inputmethod.keyboard.ProximityInfo; import com.android.inputmethod.latin.DictionaryFacilitator; @@ -34,6 +35,7 @@ import com.android.inputmethod.latin.DictionaryFacilitatorLruCache; import com.android.inputmethod.latin.NgramContext; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.RichInputMethodSubtype; +import com.android.inputmethod.latin.SuggestedWords; import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion; import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils; import com.android.inputmethod.latin.utils.ScriptUtils; @@ -159,7 +161,8 @@ public final class AndroidSpellCheckerService extends SpellCheckerService } public SuggestionResults getSuggestionResults(final Locale locale, final WordComposer composer, - final NgramContext ngramContext, final ProximityInfo proximityInfo) { + final NgramContext ngramContext, final ProximityInfo proximityInfo, + final KeyboardLayout keyboardLayout) { Integer sessionId = null; mSemaphore.acquireUninterruptibly(); try { @@ -168,7 +171,7 @@ public final class AndroidSpellCheckerService extends SpellCheckerService mDictionaryFacilitatorCache.get(locale); return dictionaryFacilitatorForLocale.getSuggestionResults(composer, ngramContext, proximityInfo.getNativeProximityInfo(), mSettingsValuesForSuggestion, - sessionId); + sessionId, SuggestedWords.INPUT_STYLE_TYPING, keyboardLayout); } finally { if (sessionId != null) { mSessionIdPool.add(sessionId); |