Merge "Remove long press settings key function" (d549d433) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java

+8 −11

Original line number	Diff line number	Diff line
		@@ -409,20 +409,17 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
		invokeReleaseKey(primaryCode);
		return true;
		}
		}
		if (primaryCode == Keyboard.CODE_SETTINGS \|\| primaryCode == Keyboard.CODE_SPACE) {
		// Both long pressing settings key and space key invoke IME switcher dialog.
		if (primaryCode == Keyboard.CODE_SPACE) {
		// Long pressing the space key invokes IME switcher dialog.
		if (invokeCustomRequest(LatinIME.CODE_SHOW_INPUT_METHOD_PICKER)) {
		tracker.onLongPressed();
		invokeReleaseKey(primaryCode);
		return true;
		} else {
		return openMoreKeysPanel(parentKey, tracker);
		}
		} else {
		return openMoreKeysPanel(parentKey, tracker);
		}
		}
		return openMoreKeysPanel(parentKey, tracker);
		}

		private boolean invokeCustomRequest(int code) {
		return getKeyboardActionListener().onCustomRequest(code);