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

Commit e893dddb authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Default to TOOL_TYPE_STYLUS for external stylus events."

parents 5e17a5de 45ccacf9

services/inputflinger/InputReader.cpp

+5 −1
Original line number Diff line number Diff line
@@ -6511,6 +6511,11 @@ void ExternalStylusInputMapper::sync(nsecs_t when) { 


    mStylusState.when = when;



    mStylusState.toolType = mTouchButtonAccumulator.getToolType();

    if (mStylusState.toolType == AMOTION_EVENT_TOOL_TYPE_UNKNOWN) {

        mStylusState.toolType = AMOTION_EVENT_TOOL_TYPE_STYLUS;

    }



    int32_t pressure = mSingleTouchMotionAccumulator.getAbsolutePressure();

    if (mRawPressureAxis.valid) {

        mStylusState.pressure = float(pressure) / mRawPressureAxis.maxValue;
@@ -6521,7 +6526,6 @@ void ExternalStylusInputMapper::sync(nsecs_t when) { 
    }



    mStylusState.buttons = mTouchButtonAccumulator.getButtonState();

    mStylusState.toolType = mTouchButtonAccumulator.getToolType();



    mContext->dispatchExternalStylusState(mStylusState);

}