diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-11-07 12:48:59 -0800 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-12-12 13:45:46 +0900 |
| commit | 31a10e226d23b30b24d9c902608ff013cc1c3e0c (patch) | |
| tree | 7401259780265deedcc8b564ad748e2fb853ff62 /java/src/com/android/inputmethod/latin/RichInputMethodManager.java | |
| parent | 8cfad7ed64d08c5a131c9c539aa4fc964030c214 (diff) | |
| download | latinime-31a10e226d23b30b24d9c902608ff013cc1c3e0c.tar.gz latinime-31a10e226d23b30b24d9c902608ff013cc1c3e0c.tar.xz latinime-31a10e226d23b30b24d9c902608ff013cc1c3e0c.zip | |
Remove SubtypeSwitcher
Change-Id: Ic4def69a9f742f13c98bc3e518c406658b52797d
Diffstat (limited to 'java/src/com/android/inputmethod/latin/RichInputMethodManager.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/RichInputMethodManager.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java index cb1de6b17..1b1e81482 100644 --- a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java +++ b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java @@ -36,6 +36,7 @@ import com.android.inputmethod.compat.InputMethodManagerCompatWrapper; import com.android.inputmethod.latin.settings.AdditionalFeaturesSettingUtils; import com.android.inputmethod.latin.settings.Settings; import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils; +import com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils; import com.android.inputmethod.latin.utils.NetworkConnectivityUtils; import com.android.inputmethod.latin.utils.SubtypeLocaleUtils; @@ -513,6 +514,15 @@ public class RichInputMethodManager { + (mShortcutSubtype == null ? "<null>" : ( mShortcutSubtype.getLocale() + ", " + mShortcutSubtype.getMode()))); } + final RichInputMethodSubtype richSubtype = mCurrentRichInputMethodSubtype; + final boolean implicitlyEnabledSubtype = checkIfSubtypeBelongsToThisImeAndImplicitlyEnabled( + richSubtype.getRawSubtype()); + final Locale systemLocale = mContext.getResources().getConfiguration().locale; + LanguageOnSpacebarUtils.onSubtypeChanged( + richSubtype, implicitlyEnabledSubtype, systemLocale); + LanguageOnSpacebarUtils.setEnabledSubtypes(getMyEnabledInputMethodSubtypeList( + true /* allowsImplicitlySelectedSubtypes */)); + // TODO: Update an icon for shortcut IME final Map<InputMethodInfo, List<InputMethodSubtype>> shortcuts = getInputMethodManager().getShortcutInputMethodsAndSubtypes(); |