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

am 5ce02267: am 7ad7b2c4: am 32b81205: Fix a bug where disabled auxilialy IME is unexpectedly re-enabled

Browse Source 
* commit '5ce0226708ec75b8636d062ae89aeb410c06659c':
  Fix a bug where disabled auxilialy IME is unexpectedly re-enabled
This commit is contained in:
satok
2012-12-19 10:27:42 -08:00
committed by Android Git Automerger
parent cae1550e91 5ce0226708
commit 52ed1fdf10
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -782,6 +782,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
if (!isSystemIme(imi)) {
return false;
}
if (imi.isAuxiliaryIme()) {
return false;
}
if (imi.getIsDefaultResourceId() != 0) {
try {
Resources res = context.createPackageContext(
@@ -805,6 +808,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
if (!isSystemIme(imi)) {
return false;
}
if (imi.isAuxiliaryIme()) {
return false;
}
return containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage());
}
@@ -2858,6 +2864,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
List<Pair<String, ArrayList<String>>> enabledInputMethodsList = mSettings
.getEnabledInputMethodsAndSubtypeListLocked();
if (DEBUG) {
Slog.d(TAG, (enabled ? "Enable " : "Disable ") + id);
}
if (enabled) {
for (Pair<String, ArrayList<String>> pair: enabledInputMethodsList) {
if (pair.first.equals(id)) {