Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev (c921ce26) · Commits · e / os / android_frameworks_native-old

include/android/input.h

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -305,12 +305,6 @@ enum {
	/* The pointer is not down but has exited the boundaries of a window or view.		/* The pointer is not down but has exited the boundaries of a window or view.
	*/		*/
	AMOTION_EVENT_ACTION_HOVER_EXIT = 10,		AMOTION_EVENT_ACTION_HOVER_EXIT = 10,

	/* One or more buttons have been pressed. */
	AMOTION_EVENT_ACTION_BUTTON_PRESS = 11,

	/* One or more buttons have been released. */
	AMOTION_EVENT_ACTION_BUTTON_RELEASE = 12,
	};		};

	/*		/*
	@@ -411,8 +405,6 @@ enum {
	AMOTION_EVENT_BUTTON_TERTIARY = 1 << 2,		AMOTION_EVENT_BUTTON_TERTIARY = 1 << 2,
	AMOTION_EVENT_BUTTON_BACK = 1 << 3,		AMOTION_EVENT_BUTTON_BACK = 1 << 3,
	AMOTION_EVENT_BUTTON_FORWARD = 1 << 4,		AMOTION_EVENT_BUTTON_FORWARD = 1 << 4,
	AMOTION_EVENT_BUTTON_STYLUS_PRIMARY = 1 << 5,
	AMOTION_EVENT_BUTTON_STYLUS_SECONDARY = 1 << 6,
	};		};

	/*		/*

include/input/Input.h

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -379,10 +379,6 @@ public:

	inline int32_t getButtonState() const { return mButtonState; }		inline int32_t getButtonState() const { return mButtonState; }

	inline int32_t setButtonState(int32_t buttonState) { mButtonState = buttonState; }

	inline int32_t getActionButton() const { return mActionButton; }

	inline float getXOffset() const { return mXOffset; }		inline float getXOffset() const { return mXOffset; }

	inline float getYOffset() const { return mYOffset; }		inline float getYOffset() const { return mYOffset; }
	@@ -536,7 +532,6 @@ public:
	int32_t deviceId,		int32_t deviceId,
	int32_t source,		int32_t source,
	int32_t action,		int32_t action,
	int32_t actionButton,
	int32_t flags,		int32_t flags,
	int32_t edgeFlags,		int32_t edgeFlags,
	int32_t metaState,		int32_t metaState,
	@@ -589,7 +584,6 @@ public:

	protected:		protected:
	int32_t mAction;		int32_t mAction;
	int32_t mActionButton;
	int32_t mFlags;		int32_t mFlags;
	int32_t mEdgeFlags;		int32_t mEdgeFlags;
	int32_t mMetaState;		int32_t mMetaState;

include/input/InputTransport.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -84,7 +84,6 @@ struct InputMessage {
	int32_t deviceId;		int32_t deviceId;
	int32_t source;		int32_t source;
	int32_t action;		int32_t action;
	int32_t actionButton;
	int32_t flags;		int32_t flags;
	int32_t metaState;		int32_t metaState;
	int32_t buttonState;		int32_t buttonState;
	@@ -233,7 +232,6 @@ public:
	int32_t deviceId,		int32_t deviceId,
	int32_t source,		int32_t source,
	int32_t action,		int32_t action,
	int32_t actionButton,
	int32_t flags,		int32_t flags,
	int32_t edgeFlags,		int32_t edgeFlags,
	int32_t metaState,		int32_t metaState,

libs/input/Input.cpp

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -216,7 +216,6 @@ void MotionEvent::initialize(
	int32_t deviceId,		int32_t deviceId,
	int32_t source,		int32_t source,
	int32_t action,		int32_t action,
	int32_t actionButton,
	int32_t flags,		int32_t flags,
	int32_t edgeFlags,		int32_t edgeFlags,
	int32_t metaState,		int32_t metaState,
	@@ -232,7 +231,6 @@ void MotionEvent::initialize(
	const PointerCoords* pointerCoords) {		const PointerCoords* pointerCoords) {
	InputEvent::initialize(deviceId, source);		InputEvent::initialize(deviceId, source);
	mAction = action;		mAction = action;
	mActionButton = actionButton;
	mFlags = flags;		mFlags = flags;
	mEdgeFlags = edgeFlags;		mEdgeFlags = edgeFlags;
	mMetaState = metaState;		mMetaState = metaState;
	@@ -252,7 +250,6 @@ void MotionEvent::initialize(
	void MotionEvent::copyFrom(const MotionEvent* other, bool keepHistory) {		void MotionEvent::copyFrom(const MotionEvent* other, bool keepHistory) {
	InputEvent::initialize(other->mDeviceId, other->mSource);		InputEvent::initialize(other->mDeviceId, other->mSource);
	mAction = other->mAction;		mAction = other->mAction;
	mActionButton = other->mActionButton;
	mFlags = other->mFlags;		mFlags = other->mFlags;
	mEdgeFlags = other->mEdgeFlags;		mEdgeFlags = other->mEdgeFlags;
	mMetaState = other->mMetaState;		mMetaState = other->mMetaState;
	@@ -431,7 +428,6 @@ status_t MotionEvent::readFromParcel(Parcel* parcel) {
	mDeviceId = parcel->readInt32();		mDeviceId = parcel->readInt32();
	mSource = parcel->readInt32();		mSource = parcel->readInt32();
	mAction = parcel->readInt32();		mAction = parcel->readInt32();
	mActionButton = parcel->readInt32();
	mFlags = parcel->readInt32();		mFlags = parcel->readInt32();
	mEdgeFlags = parcel->readInt32();		mEdgeFlags = parcel->readInt32();
	mMetaState = parcel->readInt32();		mMetaState = parcel->readInt32();
	@@ -479,7 +475,6 @@ status_t MotionEvent::writeToParcel(Parcel* parcel) const {
	parcel->writeInt32(mDeviceId);		parcel->writeInt32(mDeviceId);
	parcel->writeInt32(mSource);		parcel->writeInt32(mSource);
	parcel->writeInt32(mAction);		parcel->writeInt32(mAction);
	parcel->writeInt32(mActionButton);
	parcel->writeInt32(mFlags);		parcel->writeInt32(mFlags);
	parcel->writeInt32(mEdgeFlags);		parcel->writeInt32(mEdgeFlags);
	parcel->writeInt32(mMetaState);		parcel->writeInt32(mMetaState);

libs/input/InputTransport.cpp

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -283,7 +283,6 @@ status_t InputPublisher::publishMotionEvent(
	int32_t deviceId,		int32_t deviceId,
	int32_t source,		int32_t source,
	int32_t action,		int32_t action,
	int32_t actionButton,
	int32_t flags,		int32_t flags,
	int32_t edgeFlags,		int32_t edgeFlags,
	int32_t metaState,		int32_t metaState,
	@@ -299,12 +298,12 @@ status_t InputPublisher::publishMotionEvent(
	const PointerCoords* pointerCoords) {		const PointerCoords* pointerCoords) {
	#if DEBUG_TRANSPORT_ACTIONS		#if DEBUG_TRANSPORT_ACTIONS
	ALOGD("channel '%s' publisher ~ publishMotionEvent: seq=%u, deviceId=%d, source=0x%x, "		ALOGD("channel '%s' publisher ~ publishMotionEvent: seq=%u, deviceId=%d, source=0x%x, "
	"action=0x%x, actionButton=0x%08x, flags=0x%x, edgeFlags=0x%x, "		"action=0x%x, flags=0x%x, edgeFlags=0x%x, metaState=0x%x, buttonState=0x%x, "
	"metaState=0x%x, buttonState=0x%x, xOffset=%f, yOffset=%f, "		"xOffset=%f, yOffset=%f, "
	"xPrecision=%f, yPrecision=%f, downTime=%lld, eventTime=%lld, "		"xPrecision=%f, yPrecision=%f, downTime=%lld, eventTime=%lld, "
	"pointerCount=%" PRIu32,		"pointerCount=%" PRIu32,
	mChannel->getName().string(), seq,		mChannel->getName().string(), seq,
	deviceId, source, action, actionButton, flags, edgeFlags, metaState, buttonState,		deviceId, source, action, flags, edgeFlags, metaState, buttonState,
	xOffset, yOffset, xPrecision, yPrecision, downTime, eventTime, pointerCount);		xOffset, yOffset, xPrecision, yPrecision, downTime, eventTime, pointerCount);
	#endif		#endif

	@@ -325,7 +324,6 @@ status_t InputPublisher::publishMotionEvent(
	msg.body.motion.deviceId = deviceId;		msg.body.motion.deviceId = deviceId;
	msg.body.motion.source = source;		msg.body.motion.source = source;
	msg.body.motion.action = action;		msg.body.motion.action = action;
	msg.body.motion.actionButton = actionButton;
	msg.body.motion.flags = flags;		msg.body.motion.flags = flags;
	msg.body.motion.edgeFlags = edgeFlags;		msg.body.motion.edgeFlags = edgeFlags;
	msg.body.motion.metaState = metaState;		msg.body.motion.metaState = metaState;
	@@ -909,7 +907,6 @@ void InputConsumer::initializeMotionEvent(MotionEvent* event, const InputMessage
	msg->body.motion.deviceId,		msg->body.motion.deviceId,
	msg->body.motion.source,		msg->body.motion.source,
	msg->body.motion.action,		msg->body.motion.action,
	msg->body.motion.actionButton,
	msg->body.motion.flags,		msg->body.motion.flags,
	msg->body.motion.edgeFlags,		msg->body.motion.edgeFlags,
	msg->body.motion.metaState,		msg->body.motion.metaState,