Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99433ac1 authored by Harry Cutts's avatar Harry Cutts Committed by Android (Google) Code Review
Browse files

Merge changes I2ba46ba8,I7c7dd535 into main 

* changes:
  GestureConverter: remove checks on choreographer flag
  GestureConverter_test: disable pointer controller with choreographer
parents 6f6605a5 1f693f3f

services/inputflinger/reader/mapper/gestures/GestureConverter.cpp

+12 −24
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ GestureConverter::GestureConverter(InputReaderContext& readerContext, 
      : mDeviceId(deviceId),

        mReaderContext(readerContext),

        mPointerController(readerContext.getPointerController(deviceId)),

        mEnablePointerChoreographer(input_flags::enable_pointer_choreographer()),

        mEnableFlingStop(input_flags::enable_touchpad_fling_stop()) {

    deviceContext.getAbsoluteAxisInfo(ABS_MT_POSITION_X, &mXAxisInfo);

    deviceContext.getAbsoluteAxisInfo(ABS_MT_POSITION_Y, &mYAxisInfo);
@@ -175,8 +174,7 @@ std::list<NotifyArgs> GestureConverter::handleMove(nsecs_t when, nsecs_t readTim 
                                                   const Gesture& gesture) {

    float deltaX = gesture.details.move.dx;

    float deltaY = gesture.details.move.dy;

    const auto [oldXCursorPosition, oldYCursorPosition] =

            mEnablePointerChoreographer ? FloatPoint{0, 0} : mPointerController->getPosition();

    const auto [oldXCursorPosition, oldYCursorPosition] = mPointerController->getPosition();

    if (ENABLE_TOUCHPAD_PALM_REJECTION_V2) {

        bool wasHoverCancelled = mIsHoverCancelled;

        // Gesture will be cancelled if it started before the user started typing and
@@ -214,8 +212,7 @@ std::list<NotifyArgs> GestureConverter::handleMove(nsecs_t when, nsecs_t readTim 
    if (!down) {

        out += enterHover(when, readTime, oldXCursorPosition, oldYCursorPosition);

    }

    const auto [newXCursorPosition, newYCursorPosition] =

            mEnablePointerChoreographer ? FloatPoint{0, 0} : mPointerController->getPosition();

    const auto [newXCursorPosition, newYCursorPosition] = mPointerController->getPosition();



    PointerCoords coords;

    coords.clear();
@@ -239,8 +236,7 @@ std::list<NotifyArgs> GestureConverter::handleButtonsChange(nsecs_t when, nsecs_ 
    mPointerController->setPresentation(PointerControllerInterface::Presentation::POINTER);

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



    const auto [xCursorPosition, yCursorPosition] =

            mEnablePointerChoreographer ? FloatPoint{0, 0} : mPointerController->getPosition();

    const auto [xCursorPosition, yCursorPosition] = mPointerController->getPosition();



    PointerCoords coords;

    coords.clear();
@@ -320,8 +316,7 @@ std::list<NotifyArgs> GestureConverter::handleButtonsChange(nsecs_t when, nsecs_ 


std::list<NotifyArgs> GestureConverter::releaseAllButtons(nsecs_t when, nsecs_t readTime) {

    std::list<NotifyArgs> out;

    const auto [xCursorPosition, yCursorPosition] =

            mEnablePointerChoreographer ? FloatPoint{0, 0} : mPointerController->getPosition();

    const auto [xCursorPosition, yCursorPosition] = mPointerController->getPosition();



    PointerCoords coords;

    coords.clear();
@@ -356,8 +351,7 @@ std::list<NotifyArgs> GestureConverter::handleScroll(nsecs_t when, nsecs_t readT 
                                                     const Gesture& gesture) {

    std::list<NotifyArgs> out;

    PointerCoords& coords = mFakeFingerCoords[0];

    const auto [xCursorPosition, yCursorPosition] =

            mEnablePointerChoreographer ? FloatPoint{0, 0} : mPointerController->getPosition();

    const auto [xCursorPosition, yCursorPosition] = mPointerController->getPosition();

    if (mCurrentClassification != MotionClassification::TWO_FINGER_SWIPE) {

        out += exitHover(when, readTime, xCursorPosition, yCursorPosition);
@@ -415,9 +409,8 @@ std::list<NotifyArgs> GestureConverter::handleFling(nsecs_t when, nsecs_t readTi 
                    // avoid side effects (e.g. activation of UI elements).

                    // TODO(b/326056750): add an API for fling stops.

                    mFlingMayBeInProgress = false;

                    const auto [xCursorPosition, yCursorPosition] = mEnablePointerChoreographer

                            ? FloatPoint{0, 0}

                            : mPointerController->getPosition();

                    const auto [xCursorPosition, yCursorPosition] =

                            mPointerController->getPosition();

                    PointerCoords coords;

                    coords.clear();

                    coords.setAxisValue(AMOTION_EVENT_AXIS_X, xCursorPosition);
@@ -461,8 +454,7 @@ std::list<NotifyArgs> GestureConverter::handleFling(nsecs_t when, nsecs_t readTi 


std::list<NotifyArgs> GestureConverter::endScroll(nsecs_t when, nsecs_t readTime) {

    std::list<NotifyArgs> out;

    const auto [xCursorPosition, yCursorPosition] =

            mEnablePointerChoreographer ? FloatPoint{0, 0} : mPointerController->getPosition();

    const auto [xCursorPosition, yCursorPosition] = mPointerController->getPosition();

    mFakeFingerCoords[0].setAxisValue(AMOTION_EVENT_AXIS_GESTURE_SCROLL_X_DISTANCE, 0);

    mFakeFingerCoords[0].setAxisValue(AMOTION_EVENT_AXIS_GESTURE_SCROLL_Y_DISTANCE, 0);

    NotifyMotionArgs args =
@@ -482,8 +474,7 @@ std::list<NotifyArgs> GestureConverter::endScroll(nsecs_t when, nsecs_t readTime 
                                                                             float dx, float dy) {

    std::list<NotifyArgs> out = {};



    const auto [xCursorPosition, yCursorPosition] =

            mEnablePointerChoreographer ? FloatPoint{0, 0} : mPointerController->getPosition();

    const auto [xCursorPosition, yCursorPosition] = mPointerController->getPosition();

    if (mCurrentClassification != MotionClassification::MULTI_FINGER_SWIPE) {

        // If the user changes the number of fingers mid-way through a swipe (e.g. they start with

        // three and then put a fourth finger down), the gesture library will treat it as two
@@ -547,8 +538,7 @@ std::list<NotifyArgs> GestureConverter::endScroll(nsecs_t when, nsecs_t readTime 
    if (mCurrentClassification != MotionClassification::MULTI_FINGER_SWIPE) {

        return out;

    }

    const auto [xCursorPosition, yCursorPosition] =

            mEnablePointerChoreographer ? FloatPoint{0, 0} : mPointerController->getPosition();

    const auto [xCursorPosition, yCursorPosition] = mPointerController->getPosition();

    mFakeFingerCoords[0].setAxisValue(AMOTION_EVENT_AXIS_GESTURE_X_OFFSET, 0);

    mFakeFingerCoords[0].setAxisValue(AMOTION_EVENT_AXIS_GESTURE_Y_OFFSET, 0);
@@ -571,8 +561,7 @@ std::list<NotifyArgs> GestureConverter::endScroll(nsecs_t when, nsecs_t readTime 


[[nodiscard]] std::list<NotifyArgs> GestureConverter::handlePinch(nsecs_t when, nsecs_t readTime,

                                                                  const Gesture& gesture) {

    const auto [xCursorPosition, yCursorPosition] =

            mEnablePointerChoreographer ? FloatPoint{0, 0} : mPointerController->getPosition();

    const auto [xCursorPosition, yCursorPosition] = mPointerController->getPosition();



    // Pinch gesture phases are reported a little differently from others, in that the same details

    // struct is used for all phases of the gesture, just with different zoom_state values. When
@@ -630,8 +619,7 @@ std::list<NotifyArgs> GestureConverter::endScroll(nsecs_t when, nsecs_t readTime 


std::list<NotifyArgs> GestureConverter::endPinch(nsecs_t when, nsecs_t readTime) {

    std::list<NotifyArgs> out;

    const auto [xCursorPosition, yCursorPosition] =

            mEnablePointerChoreographer ? FloatPoint{0, 0} : mPointerController->getPosition();

    const auto [xCursorPosition, yCursorPosition] = mPointerController->getPosition();



    mFakeFingerCoords[0].setAxisValue(AMOTION_EVENT_AXIS_GESTURE_PINCH_SCALE_FACTOR, 1.0);

    out.push_back(makeMotionArgs(when, readTime,

services/inputflinger/reader/mapper/gestures/GestureConverter.h

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ private: 
    const int32_t mDeviceId;

    InputReaderContext& mReaderContext;

    std::shared_ptr<PointerControllerInterface> mPointerController;

    const bool mEnablePointerChoreographer;

    const bool mEnableFlingStop;



    std::optional<int32_t> mDisplayId;

services/inputflinger/tests/FakePointerController.cpp

+21 −1
Original line number Diff line number Diff line
@@ -37,16 +37,22 @@ const std::map<int32_t, std::vector<int32_t>>& FakePointerController::getSpots() 
}



void FakePointerController::setPosition(float x, float y) {

    if (!mEnabled) return;



    mX = x;

    mY = y;

}



FloatPoint FakePointerController::getPosition() const {

    if (!mEnabled) {

        return {0, 0};

    }



    return {mX, mY};

}



int32_t FakePointerController::getDisplayId() const {

    if (!mDisplayId) {

    if (!mEnabled || !mDisplayId) {

        return ADISPLAY_ID_NONE;

    }

    return *mDisplayId;
@@ -64,6 +70,8 @@ void FakePointerController::updatePointerIcon(PointerIconStyle iconId) { 
}



void FakePointerController::setCustomPointerIcon(const SpriteIcon& icon) {

    if (!mEnabled) return;



    ASSERT_FALSE(mCustomIconStyle.has_value()) << "Custom pointer icon was set more than once";

    mCustomIconStyle = icon.style;

}
@@ -114,10 +122,14 @@ bool FakePointerController::isPointerShown() { 
}



std::optional<FloatRect> FakePointerController::getBounds() const {

    if (!mEnabled) return std::nullopt;



    return mHaveBounds ? std::make_optional<FloatRect>(mMinX, mMinY, mMaxX, mMaxY) : std::nullopt;

}



void FakePointerController::move(float deltaX, float deltaY) {

    if (!mEnabled) return;



    mX += deltaX;

    if (mX < mMinX) mX = mMinX;

    if (mX > mMaxX) mX = mMaxX;
@@ -127,14 +139,20 @@ void FakePointerController::move(float deltaX, float deltaY) { 
}



void FakePointerController::fade(Transition) {

    if (!mEnabled) return;



    mIsPointerShown = false;

}

void FakePointerController::unfade(Transition) {

    if (!mEnabled) return;



    mIsPointerShown = true;

}



void FakePointerController::setSpots(const PointerCoords*, const uint32_t*, BitSet32 spotIdBits,

                                     int32_t displayId) {

    if (!mEnabled) return;



    std::vector<int32_t> newSpots;

    // Add spots for fingers that are down.

    for (BitSet32 idBits(spotIdBits); !idBits.isEmpty();) {
@@ -146,6 +164,8 @@ void FakePointerController::setSpots(const PointerCoords*, const uint32_t*, BitS 
}



void FakePointerController::clearSpots() {

    if (!mEnabled) return;



    mSpotsByDisplay.clear();

}

services/inputflinger/tests/FakePointerController.h

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ struct SpriteIcon { 


class FakePointerController : public PointerControllerInterface {

public:

    FakePointerController() : FakePointerController(/*enabled=*/true) {}

    FakePointerController(bool enabled) : mEnabled(enabled) {}



    virtual ~FakePointerController() {}



    void setBounds(float minX, float minY, float maxX, float maxY);
@@ -64,6 +67,7 @@ private: 
                  int32_t displayId) override;

    void clearSpots() override;



    const bool mEnabled;

    bool mHaveBounds{false};

    float mMinX{0}, mMinY{0}, mMaxX{0}, mMaxY{0};

    float mX{0}, mY{0};

services/inputflinger/tests/GestureConverter_test.cpp

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ protected: 
        mFakeEventHub->addAbsoluteAxis(EVENTHUB_ID, ABS_MT_POSITION_X, -500, 500, 0, 0, 20);

        mFakeEventHub->addAbsoluteAxis(EVENTHUB_ID, ABS_MT_POSITION_Y, -500, 500, 0, 0, 20);



        mFakePointerController = std::make_shared<FakePointerController>();

        mFakePointerController = std::make_shared<FakePointerController>(

                /*enabled=*/!input_flags::enable_pointer_choreographer());

        mFakePointerController->setBounds(0, 0, 800 - 1, 480 - 1);

        mFakePointerController->setPosition(POINTER_X, POINTER_Y);

        mFakePolicy->setPointerController(mFakePointerController);