Merge changes from topic "ToupadPointerCapture" am: be23210bbe am: 888e5ea116
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1447900
Change-Id: I9c0b1578364c981f76a5f1bf67d06969cc9d4d79
diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.cpp b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
index 394c9e4..cfc2919 100644
--- a/services/inputflinger/reader/mapper/TouchInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
@@ -191,10 +191,11 @@
info->addMotionRange(mOrientedRanges.pressure);
if (mDeviceMode == DeviceMode::UNSCALED && mSource == AINPUT_SOURCE_TOUCHPAD) {
- // Populate RELATIVE_X and RELATIVE_Y motion range for touchpad capture mode
- // RELATIVE_X and RELATIVE_Y motion range is the largest possible hardware relative
- // motion, e.g. the hardware size finger moved completely across the touchpad in one
- // sample cycle.
+ // Populate RELATIVE_X and RELATIVE_Y motion ranges for touchpad capture mode.
+ //
+ // RELATIVE_X and RELATIVE_Y motion ranges should be the largest possible relative
+ // motion, i.e. the hardware dimensions, as the finger could move completely across the
+ // touchpad in one sample cycle.
const InputDeviceInfo::MotionRange& x = mOrientedRanges.x;
const InputDeviceInfo::MotionRange& y = mOrientedRanges.y;
info->addMotionRange(AMOTION_EVENT_AXIS_RELATIVE_X, mSource, -x.max, x.max, x.flat,