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

Commit 9363c7fa authored by Prashant Malani's avatar Prashant Malani Committed by android-build-merger
Browse files

inputflinger: Add support for scaling and true value reporting am: ee03865f 

am: a777e8b7

* commit 'a777e8b7':
  inputflinger: Add support for scaling and true value reporting
parents dc482d77 a777e8b7

services/inputflinger/InputReader.cpp

+13 −2
Original line number Original line Diff line number Diff line
@@ -2751,7 +2751,18 @@ void RotaryEncoderInputMapper::populateDeviceInfo(InputDeviceInfo* info) { 
    InputMapper::populateDeviceInfo(info);

    InputMapper::populateDeviceInfo(info);





    if (mRotaryEncoderScrollAccumulator.haveRelativeVWheel()) {

    if (mRotaryEncoderScrollAccumulator.haveRelativeVWheel()) {

        info->addMotionRange(AMOTION_EVENT_AXIS_SCROLL, mSource, -1.0f, 1.0f, 0.0f, 0.0f, 0.0f);

        float res = 0.0f;

        if (!mDevice->getConfiguration().tryGetProperty(String8("device.res"), res)) {

            ALOGW("Rotary Encoder device configuration file didn't specify resolution!\n");

        }

        if (!mDevice->getConfiguration().tryGetProperty(String8("device.scalingFactor"),

            mScalingFactor)) {

            ALOGW("Rotary Encoder device configuration file didn't specify scaling factor,"

              "default to 1.0!\n");

            mScalingFactor = 1.0f;

        }

        info->addMotionRange(AMOTION_EVENT_AXIS_SCROLL, mSource, -1.0f, 1.0f, 0.0f, 0.0f,

            res * mScalingFactor);

    }

    }

}

}
@@ -2807,7 +2818,7 @@ void RotaryEncoderInputMapper::sync(nsecs_t when) { 
    // Send motion event.

    // Send motion event.

    if (scrolled) {

    if (scrolled) {

        int32_t metaState = mContext->getGlobalMetaState();

        int32_t metaState = mContext->getGlobalMetaState();

        pointerCoords.setAxisValue(AMOTION_EVENT_AXIS_SCROLL, scroll);

        pointerCoords.setAxisValue(AMOTION_EVENT_AXIS_SCROLL, scroll * mScalingFactor);





        NotifyMotionArgs scrollArgs(when, getDeviceId(), mSource, policyFlags,

        NotifyMotionArgs scrollArgs(when, getDeviceId(), mSource, policyFlags,

                AMOTION_EVENT_ACTION_SCROLL, 0, 0, metaState, 0,

                AMOTION_EVENT_ACTION_SCROLL, 0, 0, metaState, 0,

services/inputflinger/InputReader.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -1247,6 +1247,7 @@ private: 
    CursorScrollAccumulator mRotaryEncoderScrollAccumulator;

    CursorScrollAccumulator mRotaryEncoderScrollAccumulator;





    int32_t mSource;

    int32_t mSource;

    float mScalingFactor;





    void sync(nsecs_t when);

    void sync(nsecs_t when);

};

};