diff options
| author | Satoshi Kataoka <satok@google.com> | 2013-01-10 18:20:56 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-10 18:20:56 -0800 |
| commit | 50fc82fdf025bc1fee8f0eb50fa88e4591c8daae (patch) | |
| tree | 0162da5f2bed5ebe9501fb3c983b5b97845c289a /services | |
| parent | 1ec3c2ccedde5cd8ff6e94c9b1566a913d5e8db0 (diff) | |
| parent | 30b074fcbff6263db4044ff4e8f36eb5d4e136eb (diff) | |
| download | frameworks_base-50fc82fdf025bc1fee8f0eb50fa88e4591c8daae.zip frameworks_base-50fc82fdf025bc1fee8f0eb50fa88e4591c8daae.tar.gz frameworks_base-50fc82fdf025bc1fee8f0eb50fa88e4591c8daae.tar.bz2 | |
am 30b074fc: am 2495d08a: am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev
* commit '30b074fcbff6263db4044ff4e8f36eb5d4e136eb':
Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
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 cd920b1..a296d34 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)) { |