Merge "Remove buttonState from PointerController" into udc-dev (462f0237) · Commits · e / os / android_frameworks_native

services/inputflinger/include/PointerControllerInterface.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -59,12 +59,6 @@ public:
		/* Move the pointer. */
		virtual void move(float deltaX, float deltaY) = 0;

		/* Sets a mask that indicates which buttons are pressed. */
		virtual void setButtonState(int32_t buttonState) = 0;

		/* Gets a mask that indicates which buttons are pressed. */
		virtual int32_t getButtonState() const = 0;

		/* Sets the absolute location of the pointer. */
		virtual void setPosition(float x, float y) = 0;

+0 −5

Original line number	Diff line number	Diff line
		@@ -373,11 +373,6 @@ std::list<NotifyArgs> CursorInputMapper::sync(nsecs_t when, nsecs_t readTime) {
		if (moved) {
		mPointerController->move(deltaX, deltaY);
		}

		if (buttonsChanged) {
		mPointerController->setButtonState(currentButtonState);
		}

		mPointerController->unfade(PointerControllerInterface::Transition::IMMEDIATE);
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -1658,7 +1658,6 @@ void TouchInputMapper::updateTouchSpots() {
		mPointerController->setPresentation(PointerControllerInterface::Presentation::SPOT);
		mPointerController->fade(PointerControllerInterface::Transition::GRADUAL);

		mPointerController->setButtonState(mCurrentRawState.buttonState);
		mPointerController->setSpots(mCurrentCookedState.cookedPointerData.pointerCoords.cbegin(),
		mCurrentCookedState.cookedPointerData.idToIndex.cbegin(),
		mCurrentCookedState.cookedPointerData.touchingIdBits \|
		@@ -3029,8 +3028,6 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when, bool* outCancelPrevi
		prepareMultiFingerPointerGestures(when, outCancelPreviousGesture, outFinishPreviousGesture);
		}

		mPointerController->setButtonState(mCurrentRawState.buttonState);

		if (DEBUG_GESTURES) {
		ALOGD("Gestures: finishPreviousGesture=%s, cancelPreviousGesture=%s, "
		"currentGestureMode=%d, currentGestureIdBits=0x%08x, "
		@@ -3566,7 +3563,6 @@ std::list<NotifyArgs> TouchInputMapper::dispatchPointerSimple(nsecs_t when, nsec
		if (down \|\| hovering) {
		mPointerController->setPresentation(PointerControllerInterface::Presentation::POINTER);
		mPointerController->clearSpots();
		mPointerController->setButtonState(mCurrentRawState.buttonState);
		mPointerController->unfade(PointerControllerInterface::Transition::IMMEDIATE);
		} else if (!down && !hovering && (mPointerSimple.down \|\| mPointerSimple.hovering)) {
		mPointerController->fade(PointerControllerInterface::Transition::GRADUAL);

+0 −8

Original line number	Diff line number	Diff line
		@@ -37,14 +37,6 @@ void FakePointerController::setPosition(float x, float y) {
		mY = y;
		}

		void FakePointerController::setButtonState(int32_t buttonState) {
		mButtonState = buttonState;
		}

		int32_t FakePointerController::getButtonState() const {
		return mButtonState;
		}

		FloatPoint FakePointerController::getPosition() const {
		return {mX, mY};
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@ public:
		const std::map<int32_t, std::vector<int32_t>>& getSpots();

		void setPosition(float x, float y) override;
		void setButtonState(int32_t buttonState) override;
		int32_t getButtonState() const override;
		FloatPoint getPosition() const override;
		int32_t getDisplayId() const override;
		void setDisplayViewport(const DisplayViewport& viewport) override;
		@@ -54,7 +52,6 @@ private:
		bool mHaveBounds{false};
		float mMinX{0}, mMinY{0}, mMaxX{0}, mMaxY{0};
		float mX{0}, mY{0};
		int32_t mButtonState{0};
		int32_t mDisplayId{ADISPLAY_ID_DEFAULT};
		bool mIsPointerShown{false};