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

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

Browse Source 
* commit '5327322ab94711a654d41a5b53be3bf6a3a28a39':
  Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
This commit is contained in:
Satoshi Kataoka
2013-01-10 18:15:11 -08:00
committed by Android Git Automerger
parent d692ea6dd2 5327322ab9
commit 2495d08a5c
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)) {
return false;
}
if (imi.isAuxiliaryIme()) {
return false;
}
if (imi.getIsDefaultResourceId() != 0) {
try {
Resources res = context.createPackageContext(
@@ -808,9 +805,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
if (!isSystemIme(imi)) {
return false;
}
if (imi.isAuxiliaryIme()) {
return false;
}
return containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage());
}
@@ -2862,9 +2856,6 @@ 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)) {