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

Commit 46a5c477 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add getRawWidth() and getRawHeight()"

parents 13195401 26e34d9d

services/inputflinger/InputReader.cpp

+4 −4
Original line number Diff line number Diff line
@@ -3480,8 +3480,8 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { 
    }



    // Raw width and height in the natural orientation.

    int32_t rawWidth = mRawPointerAxes.x.maxValue - mRawPointerAxes.x.minValue + 1;

    int32_t rawHeight = mRawPointerAxes.y.maxValue - mRawPointerAxes.y.minValue + 1;

    int32_t rawWidth = mRawPointerAxes.getRawWidth();

    int32_t rawHeight = mRawPointerAxes.getRawHeight();



    // Get associated display dimensions.

    DisplayViewport newViewport;
@@ -3913,8 +3913,8 @@ void TouchInputMapper::configureVirtualKeys() { 


    int32_t touchScreenLeft = mRawPointerAxes.x.minValue;

    int32_t touchScreenTop = mRawPointerAxes.y.minValue;

    int32_t touchScreenWidth = mRawPointerAxes.x.maxValue - mRawPointerAxes.x.minValue + 1;

    int32_t touchScreenHeight = mRawPointerAxes.y.maxValue - mRawPointerAxes.y.minValue + 1;

    int32_t touchScreenWidth = mRawPointerAxes.getRawWidth();

    int32_t touchScreenHeight = mRawPointerAxes.getRawHeight();



    for (size_t i = 0; i < virtualKeyDefinitions.size(); i++) {

        const VirtualKeyDefinition& virtualKeyDefinition =

services/inputflinger/InputReader.h

+2 −0
Original line number Diff line number Diff line
@@ -772,6 +772,8 @@ struct RawPointerAxes { 
    RawAbsoluteAxisInfo slot;



    RawPointerAxes();

    inline int32_t getRawWidth() const { return x.maxValue - x.minValue + 1; }

    inline int32_t getRawHeight() const { return y.maxValue - y.minValue + 1; }

    void clear();

};