Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Properly rotate full [-pi, +pi] orientation range if available"

Browse Source
This commit is contained in:
Jeff Brown
2013-05-28 19:56:19 +00:00
committed by Gerrit Code Review
parent e2a281ca85 70bca4cc8a
commit 7573e5947a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/input/InputReader.cpp
View File

@@ -4170,20 +4170,24 @@ void TouchInputMapper::cookPointerData() {
x = float(in.y - mRawPointerAxes.y.minValue) * mYScale + mYTranslate; x = float(in.y - mRawPointerAxes.y.minValue) * mYScale + mYTranslate;
y = float(mRawPointerAxes.x.maxValue - in.x) * mXScale + mXTranslate; y = float(mRawPointerAxes.x.maxValue - in.x) * mXScale + mXTranslate;
orientation -= M_PI_2; orientation -= M_PI_2;
if (orientation < - M_PI_2) { if (orientation < mOrientedRanges.orientation.min) {
orientation += M_PI; orientation += (mOrientedRanges.orientation.max - mOrientedRanges.orientation.min);
} }
break; break;
case DISPLAY_ORIENTATION_180: case DISPLAY_ORIENTATION_180:
x = float(mRawPointerAxes.x.maxValue - in.x) * mXScale + mXTranslate; x = float(mRawPointerAxes.x.maxValue - in.x) * mXScale + mXTranslate;
y = float(mRawPointerAxes.y.maxValue - in.y) * mYScale + mYTranslate; y = float(mRawPointerAxes.y.maxValue - in.y) * mYScale + mYTranslate;
orientation -= M_PI;
if (orientation < mOrientedRanges.orientation.min) {
orientation += (mOrientedRanges.orientation.max - mOrientedRanges.orientation.min);
}
break; break;
case DISPLAY_ORIENTATION_270: case DISPLAY_ORIENTATION_270:
x = float(mRawPointerAxes.y.maxValue - in.y) * mYScale + mYTranslate; x = float(mRawPointerAxes.y.maxValue - in.y) * mYScale + mYTranslate;
y = float(in.x - mRawPointerAxes.x.minValue) * mXScale + mXTranslate; y = float(in.x - mRawPointerAxes.x.minValue) * mXScale + mXTranslate;
orientation += M_PI_2; orientation += M_PI_2;
if (orientation > M_PI_2) { if (orientation > mOrientedRanges.orientation.max) {
orientation -= M_PI; orientation -= (mOrientedRanges.orientation.max - mOrientedRanges.orientation.min);
} }
break; break;
default: default: