Merge "Move drag event to InputDispatcher (2/n)" into sc-dev (28b0720c) · Commits · e / os / android_frameworks_base

core/java/android/view/InputEventReceiver.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -158,6 +158,16 @@ public abstract class InputEventReceiver {
		public void onPointerCaptureEvent(boolean pointerCaptureEnabled) {
		}

		/**
		* Called when a drag event is received, from native code.
		*
		* @param isExiting if false, the window associated with this input channel has just received
		* drag
		* if true, the window associated with this input channel has just lost drag
		*/
		public void onDragEvent(boolean isExiting, float x, float y) {
		}

		/**
		* Called when a batched input event is pending.
		*

+15 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ static struct {
		jmethodID dispatchInputEvent;
		jmethodID onFocusEvent;
		jmethodID onPointerCaptureEvent;
		jmethodID onDragEvent;
		jmethodID onBatchedInputEventPending;
		} gInputEventReceiverClassInfo;

		@@ -400,6 +401,18 @@ status_t NativeInputEventReceiver::consumeEvents(JNIEnv* env,
		finishInputEvent(seq, true /* handled */);
		continue;
		}
		case AINPUT_EVENT_TYPE_DRAG: {
		const DragEvent* dragEvent = static_cast<DragEvent*>(inputEvent);
		if (kDebugDispatchCycle) {
		ALOGD("channel '%s' ~ Received drag event: isExiting=%s",
		getInputChannelName().c_str(), toString(dragEvent->isExiting()));
		}
		env->CallVoidMethod(receiverObj.get(), gInputEventReceiverClassInfo.onDragEvent,
		jboolean(dragEvent->isExiting()), dragEvent->getX(),
		dragEvent->getY());
		finishInputEvent(seq, true /* handled */);
		continue;
		}

		default:
		assert(false); // InputConsumer should prevent this from ever happening
		@@ -547,6 +560,8 @@ int register_android_view_InputEventReceiver(JNIEnv* env) {
		gInputEventReceiverClassInfo.onPointerCaptureEvent =
		GetMethodIDOrDie(env, gInputEventReceiverClassInfo.clazz, "onPointerCaptureEvent",
		"(Z)V");
		gInputEventReceiverClassInfo.onDragEvent =
		GetMethodIDOrDie(env, gInputEventReceiverClassInfo.clazz, "onDragEvent", "(ZFF)V");
		gInputEventReceiverClassInfo.onBatchedInputEventPending =
		GetMethodIDOrDie(env, gInputEventReceiverClassInfo.clazz, "onBatchedInputEventPending",
		"(I)V");