aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorsatok <satok@google.com>2010-12-20 23:51:17 +0900
committersatok <satok@google.com>2010-12-21 14:14:00 +0900
commit127ae5465e12612e30ec4fd94afe4a353295bd7c (patch)
tree8f6ac82c3e8bc1b46f27e7b17a2104aeb7f2a7aa /java
parent8aa3f5a3ad6095a3355841ce30bce4877319d0a0 (diff)
downloadlatinime-127ae5465e12612e30ec4fd94afe4a353295bd7c.tar.gz
latinime-127ae5465e12612e30ec4fd94afe4a353295bd7c.tar.xz
latinime-127ae5465e12612e30ec4fd94afe4a353295bd7c.zip
Add a parameter to getEnabledSubtype
Change-Id: Iaa87613086093bc83d155ed2c0113fc513898801
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/latin/SubtypeSwitcher.java3
-rw-r--r--java/src/com/android/inputmethod/latin/Utils.java6
2 files changed, 5 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
index 152605052..a5bfdeb94 100644
--- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
@@ -132,7 +132,8 @@ public class SubtypeSwitcher {
// 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) {
diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java
index 5c6980926..0adca0d14 100644
--- a/java/src/com/android/inputmethod/latin/Utils.java
+++ b/java/src/com/android/inputmethod/latin/Utils.java
@@ -90,9 +90,9 @@ public class Utils {
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 {