Merge "Cancel more suggestions when its outside is touched" (f01ba10c) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/MoreSuggestionsView.java

+24 −0

Original line number	Diff line number	Diff line
		@@ -145,6 +145,13 @@ public class MoreSuggestionsView extends KeyboardView implements MoreKeysPanel {
		// Nothing to do with.
		}

		private final View.OnTouchListener mMotionEventDelegate = new View.OnTouchListener() {
		@Override
		public boolean onTouch(View view, MotionEvent me) {
		return MoreSuggestionsView.this.dispatchTouchEvent(me);
		}
		};

		@Override
		public void showMoreKeysPanel(View parentView, Controller controller, int pointX, int pointY,
		PopupWindow window, KeyboardActionListener listener) {
		@@ -163,6 +170,10 @@ public class MoreSuggestionsView extends KeyboardView implements MoreKeysPanel {
		- (container.getMeasuredHeight() - container.getPaddingBottom())
		+ parentView.getPaddingTop() + mCoordinates[1];

		container.setOnTouchListener(mMotionEventDelegate);
		window.setInputMethodMode(PopupWindow.INPUT_METHOD_NOT_NEEDED);
		window.setFocusable(true);
		window.setOutsideTouchable(true);
		window.setContentView(container);
		window.setWidth(container.getMeasuredWidth());
		window.setHeight(container.getMeasuredHeight());
		@@ -217,6 +228,19 @@ public class MoreSuggestionsView extends KeyboardView implements MoreKeysPanel {
		}
		};

		@Override
		public boolean dispatchTouchEvent(MotionEvent me) {
		final int x = (int)me.getX();
		final int y = (int)me.getY();
		final boolean inside = (x >= 0 && x < getWidth() && y >= 0 && y < getHeight());
		if (inside) {
		return super.dispatchTouchEvent(me);
		} else {
		dismissMoreKeysPanel();
		return true;
		}
		}

		@Override
		public boolean onTouchEvent(MotionEvent me) {
		final int action = me.getAction();