diff options
| author | Satoshi Kataoka <satok@google.com> | 2013-01-10 18:12:43 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-10 18:12:44 -0800 |
| commit | 5327322ab94711a654d41a5b53be3bf6a3a28a39 (patch) | |
| tree | 0403bc5fd4a5aae3e63cfa3c83aef57fcb738a6c /services | |
| parent | b5e4835e3a4ff37693891a59841fcefa5c3aa648 (diff) | |
| parent | 9d08143fa72ad87572a7d5c714f379262a73e1b2 (diff) | |
| download | frameworks_base-5327322ab94711a654d41a5b53be3bf6a3a28a39.zip frameworks_base-5327322ab94711a654d41a5b53be3bf6a3a28a39.tar.gz frameworks_base-5327322ab94711a654d41a5b53be3bf6a3a28a39.tar.bz2 | |
Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 8eb61dd..94e0bd4 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -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)) { |