From 6d9021527a38ba1e94225020389621a0d7227aa1 Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Thu, 14 Apr 2011 11:42:08 +0900
Subject: Fix for language bar switching

Change-Id: Id3974642b62b012968c537eff7c1a7ee37e2def2
---
 .../inputmethod/compat/InputMethodManagerCompatWrapper.java        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java')

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());
     }
-- 
cgit v1.2.3-83-g751a