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

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

Revert "InputMapper refactor: Revert "fix touch issue on portrai..." am: 51399574 

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



Change-Id: I2a8628990176be05225e98779477ab605f305fc8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 548c9138 51399574

services/inputflinger/reader/InputDevice.cpp

+2 −2
Original line number Diff line number Diff line
@@ -500,9 +500,9 @@ std::vector<std::unique_ptr<InputMapper>> InputDevice::createMappers( 
        classes.test(InputDeviceClass::TOUCH_MT) && !isSonyDualShock4Touchpad) {

        mappers.push_back(createInputMapper<TouchpadInputMapper>(contextPtr, readerConfig));

    } else if (classes.test(InputDeviceClass::TOUCH_MT)) {

        mappers.push_back(createInputMapper<MultiTouchInputMapper>(contextPtr, readerConfig));

        mappers.push_back(std::make_unique<MultiTouchInputMapper>(contextPtr, readerConfig));

    } else if (classes.test(InputDeviceClass::TOUCH)) {

        mappers.push_back(createInputMapper<SingleTouchInputMapper>(contextPtr, readerConfig));

        mappers.push_back(std::make_unique<SingleTouchInputMapper>(contextPtr, readerConfig));

    }



    // Joystick-like devices.

services/inputflinger/reader/mapper/MultiTouchInputMapper.h

+2 −2
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ public: 
    friend std::unique_ptr<T> createInputMapper(InputDeviceContext& deviceContext,

                                                const InputReaderConfiguration& readerConfig,

                                                Args... args);

    explicit MultiTouchInputMapper(InputDeviceContext& deviceContext,

                                   const InputReaderConfiguration& readerConfig);



    ~MultiTouchInputMapper() override;
@@ -39,8 +41,6 @@ protected: 
    bool hasStylus() const override;



private:

    explicit MultiTouchInputMapper(InputDeviceContext& deviceContext,

                                   const InputReaderConfiguration& readerConfig);

    // simulate_stylus_with_touch is a debug mode that converts all finger pointers reported by this

    // mapper's touchscreen into stylus pointers, and adds SOURCE_STYLUS to the input device.

    // It is used to simulate stylus events for debugging and testing on a device that does not

services/inputflinger/reader/mapper/SingleTouchInputMapper.h

+2 −2
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ public: 
    friend std::unique_ptr<T> createInputMapper(InputDeviceContext& deviceContext,

                                                const InputReaderConfiguration& readerConfig,

                                                Args... args);

    explicit SingleTouchInputMapper(InputDeviceContext& deviceContext,

                                    const InputReaderConfiguration& readerConfig);



    ~SingleTouchInputMapper() override;
@@ -40,8 +42,6 @@ protected: 


private:

    SingleTouchMotionAccumulator mSingleTouchMotionAccumulator;

    explicit SingleTouchInputMapper(InputDeviceContext& deviceContext,

                                    const InputReaderConfiguration& readerConfig);

};



} // namespace android