resolved conflicts for merge of 7573e594 to stage-aosp-master (c8c82009) · Commits · e / os / android_frameworks_base

services/input/InputReader.cpp

+8 −4

Original line number	Diff line number	Diff line
		@@ -4252,8 +4252,8 @@ void TouchInputMapper::cookPointerData() {
		bottom = float(mRawPointerAxes.x.maxValue - rawLeft) * mXScale + mXTranslate;
		top = float(mRawPointerAxes.x.maxValue - rawRight) * mXScale + mXTranslate;
		orientation -= M_PI_2;
		if (orientation < - M_PI_2) {
		orientation += M_PI;
		if (orientation < mOrientedRanges.orientation.min) {
		orientation += (mOrientedRanges.orientation.max - mOrientedRanges.orientation.min);
		}
		break;
		case DISPLAY_ORIENTATION_180:
		@@ -4263,6 +4263,10 @@ void TouchInputMapper::cookPointerData() {
		right = float(mRawPointerAxes.x.maxValue - rawLeft) * mXScale + mXTranslate;
		bottom = float(mRawPointerAxes.y.maxValue - rawTop) * mYScale + mYTranslate;
		top = float(mRawPointerAxes.y.maxValue - rawBottom) * mYScale + mYTranslate;
		orientation -= M_PI;
		if (orientation < mOrientedRanges.orientation.min) {
		orientation += (mOrientedRanges.orientation.max - mOrientedRanges.orientation.min);
		}
		break;
		case DISPLAY_ORIENTATION_270:
		x = float(mRawPointerAxes.y.maxValue - in.y) * mYScale + mYTranslate;
		@@ -4272,8 +4276,8 @@ void TouchInputMapper::cookPointerData() {
		bottom = float(rawRight - mRawPointerAxes.x.minValue) * mXScale + mXTranslate;
		top = float(rawLeft - mRawPointerAxes.x.minValue) * mXScale + mXTranslate;
		orientation += M_PI_2;
		if (orientation > M_PI_2) {
		orientation -= M_PI;
		if (orientation > mOrientedRanges.orientation.max) {
		orientation -= (mOrientedRanges.orientation.max - mOrientedRanges.orientation.min);
		}
		break;
		default: