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

Commit c52862ed authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 5f0cbfce: am c1e7b218: Merge "Improve input device calibration format." into gingerbread 

Merge commit '5f0cbfce'

* commit '5f0cbfce':
  Improve input device calibration format.
parents 3ee1e7b5 5f0cbfce

include/ui/InputReader.h

+31 −24
Original line number Diff line number Diff line
@@ -584,31 +584,36 @@ protected: 


    // Immutable calibration parameters in parsed form.

    struct Calibration {

        // Touch Area

        enum TouchAreaCalibration {

            TOUCH_AREA_CALIBRATION_DEFAULT,

            TOUCH_AREA_CALIBRATION_NONE,

            TOUCH_AREA_CALIBRATION_GEOMETRIC,

            TOUCH_AREA_CALIBRATION_PRESSURE,

        };



        TouchAreaCalibration touchAreaCalibration;



        // Tool Area

        enum ToolAreaCalibration {

            TOOL_AREA_CALIBRATION_DEFAULT,

            TOOL_AREA_CALIBRATION_NONE,

            TOOL_AREA_CALIBRATION_GEOMETRIC,

            TOOL_AREA_CALIBRATION_LINEAR,

        };



        ToolAreaCalibration toolAreaCalibration;

        bool haveToolAreaLinearScale;

        float toolAreaLinearScale;

        bool haveToolAreaLinearBias;

        float toolAreaLinearBias;

        bool haveToolAreaIsSummed;

        int32_t toolAreaIsSummed;

        // Touch Size

        enum TouchSizeCalibration {

            TOUCH_SIZE_CALIBRATION_DEFAULT,

            TOUCH_SIZE_CALIBRATION_NONE,

            TOUCH_SIZE_CALIBRATION_GEOMETRIC,

            TOUCH_SIZE_CALIBRATION_PRESSURE,

        };



        TouchSizeCalibration touchSizeCalibration;



        // Tool Size

        enum ToolSizeCalibration {

            TOOL_SIZE_CALIBRATION_DEFAULT,

            TOOL_SIZE_CALIBRATION_NONE,

            TOOL_SIZE_CALIBRATION_GEOMETRIC,

            TOOL_SIZE_CALIBRATION_LINEAR,

            TOOL_SIZE_CALIBRATION_AREA,

        };



        ToolSizeCalibration toolSizeCalibration;

        bool haveToolSizeLinearScale;

        float toolSizeLinearScale;

        bool haveToolSizeLinearBias;

        float toolSizeLinearBias;

        bool haveToolSizeAreaScale;

        float toolSizeAreaScale;

        bool haveToolSizeAreaBias;

        float toolSizeAreaBias;

        bool haveToolSizeIsSummed;

        int32_t toolSizeIsSummed;



        // Pressure

        enum PressureCalibration {
@@ -684,8 +689,10 @@ protected: 


        float geometricScale;



        float toolAreaLinearScale;

        float toolAreaLinearBias;

        float toolSizeLinearScale;

        float toolSizeLinearBias;

        float toolSizeAreaScale;

        float toolSizeAreaBias;



        float pressureScale;
@@ -704,11 +711,11 @@ protected: 
            bool haveSize;

            InputDeviceInfo::MotionRange size;



            bool haveTouchArea;

            bool haveTouchSize;

            InputDeviceInfo::MotionRange touchMajor;

            InputDeviceInfo::MotionRange touchMinor;



            bool haveToolArea;

            bool haveToolSize;

            InputDeviceInfo::MotionRange toolMajor;

            InputDeviceInfo::MotionRange toolMinor;

libs/ui/InputReader.cpp

+176 −111

File changed.

Preview size limit exceeded, changes collapsed.