commit e7c5730804ae448d63c3cd41dce6230775dcbe2f
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 18 21:21:38 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 18 21:21:38 2021 +0000
tree 4ec233d09d9a8c72343a4a8f290ca4effbbda046
parent f79c362008297d7278bfc99c9e12da17b96b1252
parent 3f2d493099dd38e5abf6fb76f4a9e486ea9da8ba

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

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

Change-Id: Ib63fc8af5672101ca17e32b1b637e2fcb02078aa

services/inputflinger/reader/mapper/TouchInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.cpp b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
index 962d8d2..f457315 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;