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

am 50fc82fd: am 30b074fc: am 2495d08a: am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev

Browse Source 
* commit '50fc82fdf025bc1fee8f0eb50fa88e4591c8daae':
  Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
This commit is contained in:
Satoshi Kataoka
2013-01-11 10:54:31 -08:00
committed by Android Git Automerger
parent b70d9df780 50fc82fdf0
commit 9062fd8d55
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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