From 45ccacf937d0d5a957348327ad9947ae96c5d472 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Tue, 21 Apr 2015 19:01:58 +0100 Subject: [PATCH] Default to TOOL_TYPE_STYLUS for external stylus events. Change-Id: Ife6a7c4802e8b1ec1ff8445e639f8a6d90a00592 --- services/inputflinger/InputReader.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp index 3e9f7657e..8de81329d 100644 --- a/services/inputflinger/InputReader.cpp +++ b/services/inputflinger/InputReader.cpp @@ -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); }