diff options
| author |   satok <satok@google.com> | 2010-11-25 09:20:28 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2010-11-25 14:09:50 +0900 |
| commit | 79efbed76f638be298493107fa2d0cd1b5eb529e (patch) | |
| tree | 52403ed3c87bd879bafe8c1f81228aa99cd3707a /java/src/com/android/inputmethod/latin/KeyboardSwitcher.java | |
| parent | 1fb28137f43ae083c773c32440981ac61e83fa5d (diff) | |
| download | latinime-79efbed76f638be298493107fa2d0cd1b5eb529e.tar.gz latinime-79efbed76f638be298493107fa2d0cd1b5eb529e.tar.xz latinime-79efbed76f638be298493107fa2d0cd1b5eb529e.zip | |
Call showInputMethodPicker instead of showInputMethodSubtypePicker
- because showInputMethodSubtypePicker will be removed.
Change-Id: I255f9bbff77de24ce067f35ee101d368e36edd45
Diffstat (limited to 'java/src/com/android/inputmethod/latin/KeyboardSwitcher.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/KeyboardSwitcher.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java index 5db6e63d0..58958b610 100644 --- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java @@ -23,6 +23,7 @@ import android.preference.PreferenceManager; import android.util.Log; import android.view.InflateException; import android.view.inputmethod.EditorInfo; +import android.view.inputmethod.InputMethodManager; import java.lang.ref.SoftReference; import java.util.Arrays; @@ -746,7 +747,9 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha // 2) SETTINGS_KEY_MODE_AUTO and there are two or more enabled IMEs on the system if (settingsKeyMode.equals(resources.getString(SETTINGS_KEY_MODE_ALWAYS_SHOW)) || (settingsKeyMode.equals(resources.getString(SETTINGS_KEY_MODE_AUTO)) - && LatinIMEUtil.hasMultipleEnabledIMEs(context))) { + && LatinIMEUtil.hasMultipleEnabledIMEsOrSubtypes( + ((InputMethodManager) context.getSystemService( + Context.INPUT_METHOD_SERVICE))))) { return true; } } |