commit 127ae5465e12612e30ec4fd94afe4a353295bd7c
author satok <satok@google.com> Mon Dec 20 23:51:17 2010 +0900
committer satok <satok@google.com> Tue Dec 21 14:14:00 2010 +0900
tree 8f6ac82c3e8bc1b46f27e7b17a2104aeb7f2a7aa
parent 8aa3f5a3ad6095a3355841ce30bce4877319d0a0

Add a parameter to getEnabledSubtype

Change-Id: Iaa87613086093bc83d155ed2c0113fc513898801

java/src/com/android/inputmethod/latin/SubtypeSwitcher.java

diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
index 1526050..a5bfdeb 100644
--- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
@@ -132,7 +132,8 @@
     // Reload enabledSubtypes from the framework.
     private void updateEnabledSubtypes() {
         boolean foundCurrentSubtypeBecameDisabled = true;
-        mAllEnabledSubtypesOfCurrentInputMethod = mImm.getEnabledInputMethodSubtypeList(null);
+        mAllEnabledSubtypesOfCurrentInputMethod = mImm.getEnabledInputMethodSubtypeList(
+                null, false);
         mEnabledLanguagesOfCurrentInputMethod.clear();
         mEnabledKeyboardSubtypesOfCurrentInputMethod.clear();
         for (InputMethodSubtype ims: mAllEnabledSubtypesOfCurrentInputMethod) {

java/src/com/android/inputmethod/latin/Utils.java

diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java
index 5c69809..0adca0d 100644
--- a/java/src/com/android/inputmethod/latin/Utils.java
+++ b/java/src/com/android/inputmethod/latin/Utils.java
@@ -90,9 +90,9 @@
 
     public static boolean hasMultipleEnabledIMEsOrSubtypes(InputMethodManager imm) {
         return imm.getEnabledInputMethodList().size() > 1
-        // imm.getEnabledInputMethodSubtypeList(null) will return the current IME's enabled input
-        // method subtype (The current IME should be LatinIME.)
-                || imm.getEnabledInputMethodSubtypeList(null).size() > 1;
+        // imm.getEnabledInputMethodSubtypeList(null, false) will return the current IME's enabled
+        // input method subtype (The current IME should be LatinIME.)
+                || imm.getEnabledInputMethodSubtypeList(null, false).size() > 1;
     }
 
     /* package */ static class RingCharBuffer {