commit 4fb3da09d5cc1b8f6a2c5ee5e0097aa303e444b2
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 18 21:39:44 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 18 21:39:44 2021 +0000
tree 0ac00046ffb70e090ee5d284592717c3866a42c9
parent 481e96e06fd6932932b8839c4b8553908913e796
parent 8791a0ee0a83a490a187cd1711f6627a41790e09

Merge "Tilt scale correction for certain resolutions" am: 9365dde616 am: f6814fa098 am: 3f2d493099 am: e7c5730804 am: 8791a0ee0a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1753368

Change-Id: Ib7be5d1b6886384835df93366c95aca0cbf0afad

services/inputflinger/reader/mapper/TouchInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.cpp b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
index af02844..a9f0247 100644
--- a/services/inputflinger/reader/mapper/TouchInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
@@ -896,6 +896,13 @@
             mTiltXScale = M_PI / 180;
             mTiltYScale = M_PI / 180;
 
+            if (mRawPointerAxes.tiltX.resolution) {
+                mTiltXScale = 1.0 / mRawPointerAxes.tiltX.resolution;
+            }
+            if (mRawPointerAxes.tiltY.resolution) {
+                mTiltYScale = 1.0 / mRawPointerAxes.tiltY.resolution;
+            }
+
             mOrientedRanges.haveTilt = true;
 
             mOrientedRanges.tilt.axis = AMOTION_EVENT_AXIS_TILT;