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

Commit b0e28072 authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

Address additional comments: Pointer icon refactor for touch/stylus 

Bug: 293587049
Test: atest inputflinger_tests
Change-Id: I831feaf0921dfdc389e79a88690f75fa51c43720
parent 49f94b59

libs/input/PointerController.cpp

+12 −0
Original line number Diff line number Diff line
@@ -404,6 +404,10 @@ MousePointerController::MousePointerController(const sp<PointerControllerPolicyI 
    PointerController::setPresentation(Presentation::POINTER);

}



MousePointerController::~MousePointerController() {

    MousePointerController::fade(Transition::IMMEDIATE);

}



// --- TouchPointerController ---



TouchPointerController::TouchPointerController(const sp<PointerControllerPolicyInterface>& policy,
@@ -413,6 +417,10 @@ TouchPointerController::TouchPointerController(const sp<PointerControllerPolicyI 
    PointerController::setPresentation(Presentation::SPOT);

}



TouchPointerController::~TouchPointerController() {

    TouchPointerController::clearSpots();

}



// --- StylusPointerController ---



StylusPointerController::StylusPointerController(const sp<PointerControllerPolicyInterface>& policy,
@@ -422,4 +430,8 @@ StylusPointerController::StylusPointerController(const sp<PointerControllerPolic 
    PointerController::setPresentation(Presentation::STYLUS_HOVER);

}



StylusPointerController::~StylusPointerController() {

    StylusPointerController::fade(Transition::IMMEDIATE);

}



} // namespace android

libs/input/PointerController.h

+6 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ public: 
                           const sp<Looper>& looper, SpriteController& spriteController,

                           bool enabled);



    ~MousePointerController() override;



    void setPresentation(Presentation) override {

        LOG_ALWAYS_FATAL("Should not be called");

    }
@@ -161,6 +163,8 @@ public: 
                           const sp<Looper>& looper, SpriteController& spriteController,

                           bool enabled);



    ~TouchPointerController() override;



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

        LOG_ALWAYS_FATAL("Should not be called");

    }
@@ -205,6 +209,8 @@ public: 
                            const sp<Looper>& looper, SpriteController& spriteController,

                            bool enabled);



    ~StylusPointerController() override;



    void setPresentation(Presentation) override {

        LOG_ALWAYS_FATAL("Should not be called");

    }