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

Commit 0d5e66e4 authored by Harry Cutts's avatar Harry Cutts Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-21018993-VQPVABITMR" 

* changes:
  Revert "Disable new touchpad stack for Sony gamepads"
  Revert "Enable new touchpad stack by default"
parents d5095e76 13063aa7

services/inputflinger/reader/InputDevice.cpp

+2 −8
Original line number Diff line number Diff line
@@ -209,15 +209,9 @@ void InputDevice::addEventHubDevice(int32_t eventHubId, bool populateMappers) { 


    // Touchscreens and touchpad devices.

    static const bool ENABLE_TOUCHPAD_GESTURES_LIBRARY =

            sysprop::InputProperties::enable_touchpad_gestures_library().value_or(true);

    // TODO(b/246587538): Fix the new touchpad stack for Sony DualShock 4 (5c4, 9cc) and DualSense

    // (ce6) touchpads, or at least load this setting from the IDC file.

    const InputDeviceIdentifier& identifier = getDeviceInfo().getIdentifier();

    const bool isSonyGamepadTouchpad = identifier.vendor == 0x054c &&

            (identifier.product == 0x05c4 || identifier.product == 0x09cc ||

             identifier.product == 0x0ce6);

            sysprop::InputProperties::enable_touchpad_gestures_library().value_or(false);

    if (ENABLE_TOUCHPAD_GESTURES_LIBRARY && classes.test(InputDeviceClass::TOUCHPAD) &&

        classes.test(InputDeviceClass::TOUCH_MT) && !isSonyGamepadTouchpad) {

        classes.test(InputDeviceClass::TOUCH_MT)) {

        mappers.push_back(std::make_unique<TouchpadInputMapper>(*contextPtr));

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

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