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

Commit cd5c289b authored by Michael Wright's avatar Michael Wright Committed by Automerger Merge Worker
Browse files

Convert TouchInputMapper enums to enum classes. am: aff169e9 am: 54da491a am: 47c26f5b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1455627

Change-Id: Ice34d7fb6af39b8bb2fb4aff9ce1ef395fc21b5f
parents 21bdc1b2 47c26f5b

services/inputflinger/reader/mapper/MultiTouchInputMapper.h

+6 −6
Original line number Diff line number Diff line
@@ -92,15 +92,15 @@ private: 
class MultiTouchInputMapper : public TouchInputMapper {

public:

    explicit MultiTouchInputMapper(InputDeviceContext& deviceContext);

    virtual ~MultiTouchInputMapper();

    ~MultiTouchInputMapper() override;



    virtual void reset(nsecs_t when) override;

    virtual void process(const RawEvent* rawEvent) override;

    void reset(nsecs_t when) override;

    void process(const RawEvent* rawEvent) override;



protected:

    virtual void syncTouch(nsecs_t when, RawState* outState);

    virtual void configureRawPointerAxes();

    virtual bool hasStylus() const;

    void syncTouch(nsecs_t when, RawState* outState) override;

    void configureRawPointerAxes() override;

    bool hasStylus() const override;



private:

    MultiTouchMotionAccumulator mMultiTouchMotionAccumulator;

services/inputflinger/reader/mapper/SingleTouchInputMapper.h

+6 −6
Original line number Diff line number Diff line
@@ -25,15 +25,15 @@ namespace android { 
class SingleTouchInputMapper : public TouchInputMapper {

public:

    explicit SingleTouchInputMapper(InputDeviceContext& deviceContext);

    virtual ~SingleTouchInputMapper();

    ~SingleTouchInputMapper() override;



    virtual void reset(nsecs_t when) override;

    virtual void process(const RawEvent* rawEvent) override;

    void reset(nsecs_t when) override;

    void process(const RawEvent* rawEvent) override;



protected:

    virtual void syncTouch(nsecs_t when, RawState* outState);

    virtual void configureRawPointerAxes();

    virtual bool hasStylus() const;

    void syncTouch(nsecs_t when, RawState* outState) override;

    void configureRawPointerAxes() override;

    bool hasStylus() const override;



private:

    SingleTouchMotionAccumulator mSingleTouchMotionAccumulator;