aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-04-14 11:42:08 +0900
committersatok <satok@google.com>2011-04-14 12:34:48 +0900
commit6d9021527a38ba1e94225020389621a0d7227aa1 (patch)
tree6fa246da5183e62ed7c6b0c13c3633e83186fbaf /java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
parent0851abf9990cac21dad5eaa70eefe33142c0e949 (diff)
downloadlatinime-6d9021527a38ba1e94225020389621a0d7227aa1.tar.gz
latinime-6d9021527a38ba1e94225020389621a0d7227aa1.tar.xz
latinime-6d9021527a38ba1e94225020389621a0d7227aa1.zip
Fix for language bar switching
Change-Id: Id3974642b62b012968c537eff7c1a7ee37e2def2
Diffstat (limited to 'java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java')
-rw-r--r--java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java b/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
index e7eaba2d8..2b7e25591 100644
--- a/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
+++ b/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
@@ -107,7 +107,8 @@ public class InputMethodManagerCompatWrapper {
public List<InputMethodSubtypeCompatWrapper> getEnabledInputMethodSubtypeList(
InputMethodInfoCompatWrapper imi, boolean allowsImplicitlySelectedSubtypes) {
if (!SUBTYPE_SUPPORTED) {
- String[] languages = mLanguageSwitcherProxy.getEnabledLanguages();
+ String[] languages = mLanguageSwitcherProxy.getEnabledLanguages(
+ allowsImplicitlySelectedSubtypes);
List<InputMethodSubtypeCompatWrapper> subtypeList =
new ArrayList<InputMethodSubtypeCompatWrapper>();
for (String lang: languages) {
@@ -195,10 +196,6 @@ public class InputMethodManagerCompatWrapper {
public void setInputMethodAndSubtype(
IBinder token, String id, InputMethodSubtypeCompatWrapper subtype) {
- if (!SUBTYPE_SUPPORTED) {
- mLanguageSwitcherProxy.setLocale(subtype.getLocale());
- return;
- }
CompatUtils.invoke(mImm, null, METHOD_setInputMethodAndSubtype,
token, id, subtype.getOriginalObject());
}