Merge "Remove IMMS#MSG_SHOW_IM_SUBTYPE_ENABLER" (1e8a8ae0) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -219,7 +219,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		}

		private static final int MSG_SHOW_IM_SUBTYPE_PICKER = 1;
		private static final int MSG_SHOW_IM_SUBTYPE_ENABLER = 2;
		private static final int MSG_SHOW_IM_CONFIG = 3;

		private static final int MSG_UNBIND_INPUT = 1000;
		@@ -3694,8 +3693,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		if (!calledFromValidUserLocked()) {
		return;
		}
		executeOrSendMessage(getCurMethodLocked(), mCaller.obtainMessageO(
		MSG_SHOW_IM_SUBTYPE_ENABLER, inputMethodId));
		showInputMethodAndSubtypeEnabler(inputMethodId);
		}
		}

		@@ -4218,10 +4216,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		mMenuController.showInputMethodMenu(showAuxSubtypes, displayId);
		return true;

		case MSG_SHOW_IM_SUBTYPE_ENABLER:
		showInputMethodAndSubtypeEnabler((String)msg.obj);
		return true;

		case MSG_SHOW_IM_CONFIG:
		showConfigureInputMethods();
		return true;