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

Commit b666881f authored by Arpit Singh's avatar Arpit Singh Committed by Automerger Merge Worker
Browse files

Merge "InputMapper refactor: Rename configure to reconfigure" into udc-dev am: 4d6d28e6 

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



Change-Id: Ib7d8d5a23470ebf21bf888654ce518a7c65c4852
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3a45d9ef 4d6d28e6

services/inputflinger/reader/InputDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ std::list<NotifyArgs> InputDevice::configure(nsecs_t when, const InputReaderConf 
        }



        for_each_mapper([this, when, &config, changes, &out](InputMapper& mapper) {

            out += mapper.configure(when, config, changes);

            out += mapper.reconfigure(when, config, changes);

            mSources |= mapper.getSources();

        });

services/inputflinger/reader/mapper/CursorInputMapper.cpp

+4 −4
Original line number Diff line number Diff line
@@ -133,10 +133,10 @@ void CursorInputMapper::dump(std::string& dump) { 
    dump += StringPrintf(INDENT3 "DownTime: %" PRId64 "\n", mDownTime);

}



std::list<NotifyArgs> CursorInputMapper::configure(nsecs_t when,

std::list<NotifyArgs> CursorInputMapper::reconfigure(nsecs_t when,

                                                     const InputReaderConfiguration* config,

                                                     uint32_t changes) {

    std::list<NotifyArgs> out = InputMapper::configure(when, config, changes);

    std::list<NotifyArgs> out = InputMapper::reconfigure(when, config, changes);



    if (!changes) { // first time only

        mCursorScrollAccumulator.configure(getDeviceContext());

services/inputflinger/reader/mapper/CursorInputMapper.h

+3 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public: 
    virtual uint32_t getSources() const override;

    virtual void populateDeviceInfo(InputDeviceInfo& deviceInfo) override;

    virtual void dump(std::string& dump) override;

    [[nodiscard]] std::list<NotifyArgs> configure(nsecs_t when,

    [[nodiscard]] std::list<NotifyArgs> reconfigure(nsecs_t when,

                                                    const InputReaderConfiguration* config,

                                                    uint32_t changes) override;

    [[nodiscard]] std::list<NotifyArgs> reset(nsecs_t when) override;

services/inputflinger/reader/mapper/ExternalStylusInputMapper.cpp

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ void ExternalStylusInputMapper::dump(std::string& dump) { 
    dumpStylusState(dump, mStylusState);

}



std::list<NotifyArgs> ExternalStylusInputMapper::configure(nsecs_t when,

std::list<NotifyArgs> ExternalStylusInputMapper::reconfigure(nsecs_t when,

                                                             const InputReaderConfiguration* config,

                                                             uint32_t changes) {

    getAbsoluteAxisInfo(ABS_PRESSURE, &mRawPressureAxis);

services/inputflinger/reader/mapper/ExternalStylusInputMapper.h

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public: 
    uint32_t getSources() const override;

    void populateDeviceInfo(InputDeviceInfo& deviceInfo) override;

    void dump(std::string& dump) override;

    [[nodiscard]] std::list<NotifyArgs> configure(nsecs_t when,

    [[nodiscard]] std::list<NotifyArgs> reconfigure(nsecs_t when,

                                                    const InputReaderConfiguration* config,

                                                    uint32_t changes) override;

    [[nodiscard]] std::list<NotifyArgs> reset(nsecs_t when) override;