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

Commit f7c99f3f authored by Alex Chau's avatar Alex Chau
Browse files

Revert "Reland "Remove x/y offset from MotionEntry"" 

Revert submission 16336498-revert-16306432-revert-16295572-ORWQJPYRMQ-IQBEBXXQNX

Reason for revert: b/208849306
Reverted Changes:
I5afb6f7fd:Reland "Remove x/y offset from MotionEntry"
I68b5619bf:Reland "Input injection: Assume transformed values...

Change-Id: Id944e4eb39b26e3ffd51998b315a06e87a2af3d5
parent d6a7f221

include/input/Input.h

+3 −2
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ struct PointerCoords { 
    // window scale. The global scale will be applied to TOUCH/TOOL_MAJOR/MINOR

    // axes, however the window scaling will not.

    void scale(float globalScale, float windowXScale, float windowYScale);

    void applyOffset(float xOffset, float yOffset);



    void transform(const ui::Transform& transform);
@@ -566,7 +567,7 @@ public: 


    inline float getYOffset() const { return mTransform.ty(); }



    inline const ui::Transform& getTransform() const { return mTransform; }

    inline ui::Transform getTransform() const { return mTransform; }



    inline float getXPrecision() const { return mXPrecision; }
@@ -582,7 +583,7 @@ public: 


    void setCursorPosition(float x, float y);



    inline const ui::Transform& getRawTransform() const { return mRawTransform; }

    ui::Transform getRawTransform() const { return mRawTransform; }



    static inline bool isValidCursorPosition(float x, float y) { return !isnan(x) && !isnan(y); }

libs/input/Input.cpp

+5 −0
Original line number Diff line number Diff line
@@ -343,6 +343,11 @@ void PointerCoords::scale(float globalScaleFactor, float windowXScale, float win 
    scaleAxisValue(*this, AMOTION_EVENT_AXIS_RELATIVE_Y, windowYScale);

}



void PointerCoords::applyOffset(float xOffset, float yOffset) {

    setAxisValue(AMOTION_EVENT_AXIS_X, getX() + xOffset);

    setAxisValue(AMOTION_EVENT_AXIS_Y, getY() + yOffset);

}



#ifdef __linux__

status_t PointerCoords::readFromParcel(Parcel* parcel) {

    bits = parcel->readInt64();

services/inputflinger/dispatcher/Entry.cpp

+4 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ MotionEntry::MotionEntry(int32_t id, nsecs_t eventTime, int32_t deviceId, uint32 
                         int32_t edgeFlags, float xPrecision, float yPrecision,

                         float xCursorPosition, float yCursorPosition, nsecs_t downTime,

                         uint32_t pointerCount, const PointerProperties* pointerProperties,

                         const PointerCoords* pointerCoords)

                         const PointerCoords* pointerCoords, float xOffset, float yOffset)

      : EventEntry(id, Type::MOTION, eventTime, policyFlags),

        deviceId(deviceId),

        source(source),
@@ -235,6 +235,9 @@ MotionEntry::MotionEntry(int32_t id, nsecs_t eventTime, int32_t deviceId, uint32 
    for (uint32_t i = 0; i < pointerCount; i++) {

        this->pointerProperties[i].copyFrom(pointerProperties[i]);

        this->pointerCoords[i].copyFrom(pointerCoords[i]);

        if (xOffset || yOffset) {

            this->pointerCoords[i].applyOffset(xOffset, yOffset);

        }

    }

}

services/inputflinger/dispatcher/Entry.h

+2 −1
Original line number Diff line number Diff line
@@ -184,7 +184,8 @@ struct MotionEntry : EventEntry { 
                int32_t metaState, int32_t buttonState, MotionClassification classification,

                int32_t edgeFlags, float xPrecision, float yPrecision, float xCursorPosition,

                float yCursorPosition, nsecs_t downTime, uint32_t pointerCount,

                const PointerProperties* pointerProperties, const PointerCoords* pointerCoords);

                const PointerProperties* pointerProperties, const PointerCoords* pointerCoords,

                float xOffset, float yOffset);

    std::string getDescription() const override;



    ~MotionEntry() override;

services/inputflinger/dispatcher/InputDispatcher.cpp

+5 −5
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ std::unique_ptr<DispatchEntry> createDispatchEntry(const InputTarget& inputTarge 
                                          motionEntry.yPrecision, motionEntry.xCursorPosition,

                                          motionEntry.yCursorPosition, motionEntry.downTime,

                                          motionEntry.pointerCount, motionEntry.pointerProperties,

                                          pointerCoords.data());

                                          pointerCoords.data(), 0 /* xOffset */, 0 /* yOffset */);



    if (motionEntry.injectionState) {

        combinedMotionEntry->injectionState = motionEntry.injectionState;
@@ -3752,7 +3752,7 @@ std::unique_ptr<MotionEntry> InputDispatcher::splitMotionEvent( 
                                          originalMotionEntry.xCursorPosition,

                                          originalMotionEntry.yCursorPosition,

                                          originalMotionEntry.downTime, splitPointerCount,

                                          splitPointerProperties, splitPointerCoords);

                                          splitPointerProperties, splitPointerCoords, 0, 0);



    if (originalMotionEntry.injectionState) {

        splitMotionEntry->injectionState = originalMotionEntry.injectionState;
@@ -3978,7 +3978,7 @@ void InputDispatcher::notifyMotion(const NotifyMotionArgs* args) { 
                                              args->xPrecision, args->yPrecision,

                                              args->xCursorPosition, args->yCursorPosition,

                                              args->downTime, args->pointerCount,

                                              args->pointerProperties, args->pointerCoords);

                                              args->pointerProperties, args->pointerCoords, 0, 0);



        if (args->id != android::os::IInputConstants::INVALID_INPUT_EVENT_ID &&

            IdGenerator::getSource(args->id) == IdGenerator::Source::INPUT_READER &&
@@ -4208,7 +4208,7 @@ InputEventInjectionResult InputDispatcher::injectInputEvent( 
                                                  motionEvent.getRawXCursorPosition(),

                                                  motionEvent.getRawYCursorPosition(),

                                                  motionEvent.getDownTime(), uint32_t(pointerCount),

                                                  pointerProperties, samplePointerCoords);

                                                  pointerProperties, samplePointerCoords, 0, 0);

            transformMotionEntryForInjectionLocked(*injectedEntry, motionEvent.getTransform());

            injectedEntries.push(std::move(injectedEntry));

            for (size_t i = motionEvent.getHistorySize(); i > 0; i--) {
@@ -4228,7 +4228,7 @@ InputEventInjectionResult InputDispatcher::injectInputEvent( 
                                                      motionEvent.getRawYCursorPosition(),

                                                      motionEvent.getDownTime(),

                                                      uint32_t(pointerCount), pointerProperties,

                                                      samplePointerCoords);

                                                      samplePointerCoords, 0, 0);

                transformMotionEntryForInjectionLocked(*nextInjectedEntry,

                                                       motionEvent.getTransform());

                injectedEntries.push(std::move(nextInjectedEntry));