diff options
| author | Satoshi Kataoka <satok@google.com> | 2013-01-11 10:54:31 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-11 10:54:31 -0800 |
| commit | 9062fd8d554fe609ad6096791e5d69ceab9878fb (patch) | |
| tree | bc8536c4e401455bf286482389147e140e0c966f /services | |
| parent | b70d9df780b50f2aab2ff006e5cbfbd1a43ba332 (diff) | |
| parent | 50fc82fdf025bc1fee8f0eb50fa88e4591c8daae (diff) | |
| download | frameworks_base-9062fd8d554fe609ad6096791e5d69ceab9878fb.zip frameworks_base-9062fd8d554fe609ad6096791e5d69ceab9878fb.tar.gz frameworks_base-9062fd8d554fe609ad6096791e5d69ceab9878fb.tar.bz2 | |
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
* commit '50fc82fdf025bc1fee8f0eb50fa88e4591c8daae':
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 81ae101..91ac1de 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()); } @@ -2864,9 +2858,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)) { |