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

Commit 940a0a79 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12841171 from c5424431 to 25Q2-release 

Change-Id: I209150ad564a3f37d29c9047eeaf26871f95aa73
parents d19418a8 c5424431

libs/input/input_flags.aconfig

+0 −7
Original line number Original line Diff line number Diff line
@@ -108,13 +108,6 @@ flag { 
  bug: "246946631"

  bug: "246946631"

}

}





flag {

  name: "enable_touchpad_fling_stop"

  namespace: "input"

  description: "Enable fling scrolling to be stopped by putting a finger on the touchpad again"

  bug: "281106755"

}



flag {

flag {

  name: "enable_prediction_pruning_via_jerk_thresholding"

  name: "enable_prediction_pruning_via_jerk_thresholding"

  namespace: "input"

  namespace: "input"

services/inputflinger/reader/mapper/gestures/GestureConverter.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -81,7 +81,6 @@ GestureConverter::GestureConverter(InputReaderContext& readerContext, 
                                   const InputDeviceContext& deviceContext, int32_t deviceId)

                                   const InputDeviceContext& deviceContext, int32_t deviceId)

      : mDeviceId(deviceId),

      : mDeviceId(deviceId),

        mReaderContext(readerContext),

        mReaderContext(readerContext),

        mEnableFlingStop(input_flags::enable_touchpad_fling_stop()),

        mEnableNoFocusChange(input_flags::enable_touchpad_no_focus_change()),

        mEnableNoFocusChange(input_flags::enable_touchpad_no_focus_change()),

        // We can safely assume that ABS_MT_POSITION_X and _Y axes will be available, as EventHub

        // We can safely assume that ABS_MT_POSITION_X and _Y axes will be available, as EventHub

        // won't classify a device as a touchpad if they're not present.

        // won't classify a device as a touchpad if they're not present.
@@ -406,7 +405,7 @@ std::list<NotifyArgs> GestureConverter::handleFling(nsecs_t when, nsecs_t readTi 
            break;

            break;

        case GESTURES_FLING_TAP_DOWN:

        case GESTURES_FLING_TAP_DOWN:

            if (mCurrentClassification == MotionClassification::NONE) {

            if (mCurrentClassification == MotionClassification::NONE) {

                if (mEnableFlingStop && mFlingMayBeInProgress) {

                if (mFlingMayBeInProgress) {

                    // The user has just touched the pad again after ending a two-finger scroll

                    // The user has just touched the pad again after ending a two-finger scroll

                    // motion, which might have started a fling. We want to stop the fling, but

                    // motion, which might have started a fling. We want to stop the fling, but

                    // unfortunately there's currently no API for doing so. Instead, send and

                    // unfortunately there's currently no API for doing so. Instead, send and

services/inputflinger/reader/mapper/gestures/GestureConverter.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -104,7 +104,6 @@ private: 




    const int32_t mDeviceId;

    const int32_t mDeviceId;

    InputReaderContext& mReaderContext;

    InputReaderContext& mReaderContext;

    const bool mEnableFlingStop;

    const bool mEnableNoFocusChange;

    const bool mEnableNoFocusChange;

    bool mEnableSystemGestures{true};

    bool mEnableSystemGestures{true};

services/inputflinger/tests/GestureConverter_test.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -1297,7 +1297,6 @@ TEST_F(GestureConverterTest, FlingTapDown) { 




TEST_F(GestureConverterTest, FlingTapDownAfterScrollStopsFling) {

TEST_F(GestureConverterTest, FlingTapDownAfterScrollStopsFling) {

    InputDeviceContext deviceContext(*mDevice, EVENTHUB_ID);

    InputDeviceContext deviceContext(*mDevice, EVENTHUB_ID);

    input_flags::enable_touchpad_fling_stop(true);

    GestureConverter converter(*mReader->getContext(), deviceContext, DEVICE_ID);

    GestureConverter converter(*mReader->getContext(), deviceContext, DEVICE_ID);

    converter.setDisplayId(ui::LogicalDisplayId::DEFAULT);

    converter.setDisplayId(ui::LogicalDisplayId::DEFAULT);