Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return the enabled subtypes for the current InputMethod when the input value of getEnabledInputMethodSubtypeList was null

Browse Source 
Change-Id: I6892064dbc2214946871a0ba4ad08e00a2eb6c7b
This commit is contained in:
satok
2010-11-18 10:39:46 +09:00
parent 7b71b3d99f
commit 884ef9a11f
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/java/com/android/server/InputMethodManagerService.java
View File

@@ -557,6 +557,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
public List<InputMethodSubtype> getEnabledInputMethodSubtypeList(InputMethodInfo imi) {
synchronized (mMethodMap) {
if (imi == null && mCurMethodId != null) {
imi = mMethodMap.get(mCurMethodId);
}
return mSettings.getEnabledInputMethodSubtypeListLocked(imi);
}
}
@@ -2043,18 +2046,20 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
getEnabledInputMethodsAndSubtypeListLocked();
ArrayList<InputMethodSubtype> enabledSubtypes =
new ArrayList<InputMethodSubtype>();
for (Pair<String, ArrayList<String>> imsPair : imsList) {
InputMethodInfo info = mMethodMap.get(imsPair.first);
if (info != null && info.getId().equals(imi.getId())) {
ArrayList<InputMethodSubtype> subtypes = info.getSubtypes();
for (InputMethodSubtype ims: subtypes) {
for (String s: imsPair.second) {
if (String.valueOf(ims.hashCode()).equals(s)) {
enabledSubtypes.add(ims);
if (imi != null) {
for (Pair<String, ArrayList<String>> imsPair : imsList) {
InputMethodInfo info = mMethodMap.get(imsPair.first);
if (info != null && info.getId().equals(imi.getId())) {
ArrayList<InputMethodSubtype> subtypes = info.getSubtypes();
for (InputMethodSubtype ims: subtypes) {
for (String s: imsPair.second) {
if (String.valueOf(ims.hashCode()).equals(s)) {
enabledSubtypes.add(ims);
}
}
}
break;
}
break;
}
}
return enabledSubtypes;