diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-12-17 06:44:33 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-12-17 06:44:33 +0000 |
| commit | 7d7dc07c27eb4fcfc33a517d7ca66a9902c0d46d (patch) | |
| tree | c2673e9ca9bac378d85ae4ee3fd315b9c625d419 /java/src/com/android/inputmethod/latin/RichInputMethodManager.java | |
| parent | d3481e9f4d01478a759258d8df32e0221686d611 (diff) | |
| parent | 4077a7e52f4016484de914cbfb26e58fe06f3b65 (diff) | |
| download | latinime-7d7dc07c27eb4fcfc33a517d7ca66a9902c0d46d.tar.gz latinime-7d7dc07c27eb4fcfc33a517d7ca66a9902c0d46d.tar.xz latinime-7d7dc07c27eb4fcfc33a517d7ca66a9902c0d46d.zip | |
am 4077a7e5: Merge "Remove SubtypeSwitcher"
* commit '4077a7e52f4016484de914cbfb26e58fe06f3b65':
Remove SubtypeSwitcher
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(); |