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

Commit 356026cf authored by Seunghwan Choi's avatar Seunghwan Choi Committed by Prabir Pradhan
Browse files

Add testcase for StylusPointer 

add testcases for styluspointer

Test: atest inputflinger_tests
Bug: b/215436642
Change-Id: I898f2af2ba81ef4048281baf105fcbba6269ec47
parent 2de48e44

services/inputflinger/reader/mapper/TouchInputMapper.cpp

+2 −1
Original line number Diff line number Diff line
@@ -3709,7 +3709,8 @@ NotifyMotionArgs TouchInputMapper::dispatchMotion( 
    const int32_t displayId = getAssociatedDisplayId().value_or(ADISPLAY_ID_NONE);

    const bool showDirectStylusPointer = mConfig.stylusPointerIconEnabled &&

            mDeviceMode == DeviceMode::DIRECT && isStylusEvent(source, action, pointerProperties) &&

            displayId != ADISPLAY_ID_NONE && displayId == mPointerController->getDisplayId();

            mPointerController && displayId != ADISPLAY_ID_NONE &&

            displayId == mPointerController->getDisplayId();

    if (showDirectStylusPointer) {

        switch (action & AMOTION_EVENT_ACTION_MASK) {

            case AMOTION_EVENT_ACTION_HOVER_ENTER:

services/inputflinger/tests/FakeInputReaderPolicy.cpp

+4 −0
Original line number Diff line number Diff line
@@ -205,6 +205,10 @@ void FakeInputReaderPolicy::setStylusButtonMotionEventsEnabled(bool enabled) { 
    mConfig.stylusButtonMotionEventsEnabled = enabled;

}



void FakeInputReaderPolicy::setStylusPointerIconEnabled(bool enabled) {

    mConfig.stylusPointerIconEnabled = enabled;

}



void FakeInputReaderPolicy::getReaderConfiguration(InputReaderConfiguration* outConfig) {

    *outConfig = mConfig;

}

services/inputflinger/tests/FakeInputReaderPolicy.h

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ public: 
    float getPointerGestureZoomSpeedRatio();

    void setVelocityControlParams(const VelocityControlParameters& params);

    void setStylusButtonMotionEventsEnabled(bool enabled);

    void setStylusPointerIconEnabled(bool enabled);



private:

    void getReaderConfiguration(InputReaderConfiguration* outConfig) override;

services/inputflinger/tests/FakePointerController.cpp

+11 −0
Original line number Diff line number Diff line
@@ -65,6 +65,10 @@ void FakePointerController::assertPosition(float x, float y) { 
    ASSERT_NEAR(y, actualY, 1);

}



bool FakePointerController::isPointerShown() {

    return mIsPointerShown;

}



bool FakePointerController::getBounds(float* outMinX, float* outMinY, float* outMaxX,

                                      float* outMaxY) const {

    *outMinX = mMinX;
@@ -83,6 +87,13 @@ void FakePointerController::move(float deltaX, float deltaY) { 
    if (mY > mMaxY) mY = mMaxY;

}



void FakePointerController::fade(Transition) {

    mIsPointerShown = false;

}

void FakePointerController::unfade(Transition) {

    mIsPointerShown = true;

}



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

                                     int32_t displayId) {

    std::vector<int32_t> newSpots;

services/inputflinger/tests/FakePointerController.h

+4 −2
Original line number Diff line number Diff line
@@ -39,12 +39,13 @@ public: 
    void setDisplayViewport(const DisplayViewport& viewport) override;



    void assertPosition(float x, float y);

    bool isPointerShown();



private:

    bool getBounds(float* outMinX, float* outMinY, float* outMaxX, float* outMaxY) const override;

    void move(float deltaX, float deltaY) override;

    void fade(Transition) override {}

    void unfade(Transition) override {}

    void fade(Transition) override;

    void unfade(Transition) override;

    void setPresentation(Presentation) override {}

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

                  int32_t displayId) override;
@@ -55,6 +56,7 @@ private: 
    float mX{0}, mY{0};

    int32_t mButtonState{0};

    int32_t mDisplayId{ADISPLAY_ID_DEFAULT};

    bool mIsPointerShown{false};



    std::map<int32_t, std::vector<int32_t>> mSpotsByDisplay;

};