From 127ae5465e12612e30ec4fd94afe4a353295bd7c Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Mon, 20 Dec 2010 23:51:17 +0900
Subject: [PATCH] Add a parameter to getEnabledSubtype
Change-Id: Iaa87613086093bc83d155ed2c0113fc513898801
---
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java | 3 ++-
java/src/com/android/inputmethod/latin/Utils.java | 6 +++---
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 152605052f..a5bfdeb94a 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 5c69809264..0adca0d14d 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 {
--
GitLab