Merge "Extend the for loop to use all samples" (411b8e6f) · Commits · e / os / android_frameworks_native-old

include/input/Input.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -578,10 +578,18 @@ public:

		float getAxisValue(int32_t axis, size_t pointerIndex) const;

		/**
		* Get the X coordinate of the latest sample in this MotionEvent for pointer 'pointerIndex'.
		* Identical to calling getHistoricalX(pointerIndex, getHistorySize()).
		*/
		inline float getX(size_t pointerIndex) const {
		return getAxisValue(AMOTION_EVENT_AXIS_X, pointerIndex);
		}

		/**
		* Get the Y coordinate of the latest sample in this MotionEvent for pointer 'pointerIndex'.
		* Identical to calling getHistoricalX(pointerIndex, getHistorySize()).
		*/
		inline float getY(size_t pointerIndex) const {
		return getAxisValue(AMOTION_EVENT_AXIS_Y, pointerIndex);
		}

+2 −11

Original line number	Diff line number	Diff line
		@@ -289,13 +289,12 @@ void VelocityTracker::addMovement(const MotionEvent* event) {
		pointerIndex[i] = idBits.getIndexOfBit(event->getPointerId(i));
		}

		nsecs_t eventTime;
		std::vector<Position> positions;
		positions.resize(pointerCount);

		size_t historySize = event->getHistorySize();
		for (size_t h = 0; h < historySize; h++) {
		eventTime = event->getHistoricalEventTime(h);
		for (size_t h = 0; h <= historySize; h++) {
		nsecs_t eventTime = event->getHistoricalEventTime(h);
		for (size_t i = 0; i < pointerCount; i++) {
		uint32_t index = pointerIndex[i];
		positions[index].x = event->getHistoricalX(i, h);
		@@ -303,14 +302,6 @@ void VelocityTracker::addMovement(const MotionEvent* event) {
		}
		addMovement(eventTime, idBits, positions);
		}

		eventTime = event->getEventTime();
		for (size_t i = 0; i < pointerCount; i++) {
		uint32_t index = pointerIndex[i];
		positions[index].x = event->getX(i);
		positions[index].y = event->getY(i);
		}
		addMovement(eventTime, idBits, positions);
		}

		bool VelocityTracker::getVelocity(uint32_t id, float* outVx, float* outVy) const {