Removed InputMethodSubtypePicker
Change-Id: I08abac5d65a30c02cc671f4f70e93df25b6c8a92
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index c574058..5859f4f 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1277,34 +1277,12 @@
+ Binder.getCallingUid() + ": " + client);
}
- mHandler.sendEmptyMessage(MSG_SHOW_IM_PICKER);
- }
- }
-
- public void showInputMethodSubtypePickerFromClient(IInputMethodClient client) {
- synchronized (mMethodMap) {
- if (mCurClient == null || client == null
- || mCurClient.client.asBinder() != client.asBinder()) {
- Slog.w(TAG, "Ignoring showInputMethodSubtypePickerFromClient of: " + client);
- }
-
+ // Always call subtype picker, because subtype picker is a superset of input method
+ // picker.
mHandler.sendEmptyMessage(MSG_SHOW_IM_SUBTYPE_PICKER);
}
}
- public void showInputMethodAndSubtypeEnablerFromClient(
- IInputMethodClient client, String topId) {
- // TODO: Handle topId for setting the top position of the list activity
- synchronized (mMethodMap) {
- if (mCurClient == null || client == null
- || mCurClient.client.asBinder() != client.asBinder()) {
- Slog.w(TAG, "Ignoring showInputMethodAndSubtypeEnablerFromClient of: " + client);
- }
-
- mHandler.sendEmptyMessage(MSG_SHOW_IM_SUBTYPE_ENABLER);
- }
- }
-
public void setInputMethod(IBinder token, String id) {
setInputMethodWithSubtypeId(token, id, NOT_A_SUBTYPE_ID);
}