Merge "InputReaderConfiguration: remove old touchpad stack fields" into main (47a99875) · Commits · e / os / android_frameworks_native

services/inputflinger/include/InputReaderBase.h

+0 −86

Original line number	Original line	Diff line number	Diff line
	@@ -155,83 +155,12 @@ struct InputReaderConfiguration {
	// speed setting still affects the scaling factor.		// speed setting still affects the scaling factor.
	bool touchpadAccelerationEnabled;		bool touchpadAccelerationEnabled;

	// Velocity control parameters for touchpad pointer movements on the old touchpad stack (based
	// on TouchInputMapper).
	//
	// For mice, these are ignored and the values of mousePointerSpeed and
	// mousePointerAccelerationEnabled used instead.
	//
	// TODO(b/281840344): remove, and check if other fields beginning with pointer… are still used.
	VelocityControlParameters pointerVelocityControlParameters;

	// Velocity control parameters for mouse wheel movements.		// Velocity control parameters for mouse wheel movements.
	VelocityControlParameters wheelVelocityControlParameters;		VelocityControlParameters wheelVelocityControlParameters;

	// True if pointer gestures are enabled.		// True if pointer gestures are enabled.
	bool pointerGesturesEnabled;		bool pointerGesturesEnabled;

	// Quiet time between certain pointer gesture transitions.
	// Time to allow for all fingers or buttons to settle into a stable state before
	// starting a new gesture.
	nsecs_t pointerGestureQuietInterval;

	// The minimum speed that a pointer must travel for us to consider switching the active
	// touch pointer to it during a drag. This threshold is set to avoid switching due
	// to noise from a finger resting on the touch pad (perhaps just pressing it down).
	float pointerGestureDragMinSwitchSpeed; // in pixels per second

	// Tap gesture delay time.
	// The time between down and up must be less than this to be considered a tap.
	nsecs_t pointerGestureTapInterval;

	// Tap drag gesture delay time.
	// The time between the previous tap's up and the next down must be less than
	// this to be considered a drag. Otherwise, the previous tap is finished and a
	// new tap begins.
	//
	// Note that the previous tap will be held down for this entire duration so this
	// interval must be shorter than the long press timeout.
	nsecs_t pointerGestureTapDragInterval;

	// The distance in pixels that the pointer is allowed to move from initial down
	// to up and still be called a tap.
	float pointerGestureTapSlop; // in pixels

	// Time after the first touch points go down to settle on an initial centroid.
	// This is intended to be enough time to handle cases where the user puts down two
	// fingers at almost but not quite exactly the same time.
	nsecs_t pointerGestureMultitouchSettleInterval;

	// The transition from PRESS to SWIPE or FREEFORM gesture mode is made when
	// at least two pointers have moved at least this far from their starting place.
	float pointerGestureMultitouchMinDistance; // in pixels

	// The transition from PRESS to SWIPE gesture mode can only occur when the
	// cosine of the angle between the two vectors is greater than or equal to than this value
	// which indicates that the vectors are oriented in the same direction.
	// When the vectors are oriented in the exactly same direction, the cosine is 1.0.
	// (In exactly opposite directions, the cosine is -1.0.)
	float pointerGestureSwipeTransitionAngleCosine;

	// The transition from PRESS to SWIPE gesture mode can only occur when the
	// fingers are no more than this far apart relative to the diagonal size of
	// the touch pad. For example, a ratio of 0.5 means that the fingers must be
	// no more than half the diagonal size of the touch pad apart.
	float pointerGestureSwipeMaxWidthRatio;

	// The gesture movement speed factor relative to the size of the display.
	// Movement speed applies when the fingers are moving in the same direction.
	// Without acceleration, a full swipe of the touch pad diagonal in movement mode
	// will cover this portion of the display diagonal.
	float pointerGestureMovementSpeedRatio;

	// The gesture zoom speed factor relative to the size of the display.
	// Zoom speed applies when the fingers are mostly moving relative to each other
	// to execute a scale gesture or similar.
	// Without acceleration, a full swipe of the touch pad diagonal in zoom mode
	// will cover this portion of the display diagonal.
	float pointerGestureZoomSpeedRatio;

	// The latest request to enable or disable Pointer Capture.		// The latest request to enable or disable Pointer Capture.
	PointerCaptureRequest pointerCaptureRequest;		PointerCaptureRequest pointerCaptureRequest;

	@@ -290,26 +219,11 @@ struct InputReaderConfiguration {
	displaysWithMouseScalingDisabled(),		displaysWithMouseScalingDisabled(),
	mousePointerAccelerationEnabled(true),		mousePointerAccelerationEnabled(true),
	touchpadAccelerationEnabled(true),		touchpadAccelerationEnabled(true),
	pointerVelocityControlParameters(1.0f, 500.0f, 3000.0f,
	static_cast<float>(
	android::os::IInputConstants::
	DEFAULT_POINTER_ACCELERATION)),
	wheelVelocityControlParameters(1.0f, 15.0f, 50.0f,		wheelVelocityControlParameters(1.0f, 15.0f, 50.0f,
	static_cast<float>(		static_cast<float>(
	android::os::IInputConstants::		android::os::IInputConstants::
	DEFAULT_MOUSE_WHEEL_ACCELERATION)),		DEFAULT_MOUSE_WHEEL_ACCELERATION)),
	pointerGesturesEnabled(true),		pointerGesturesEnabled(true),
	pointerGestureQuietInterval(100 * 1000000LL), // 100 ms
	pointerGestureDragMinSwitchSpeed(50), // 50 pixels per second
	pointerGestureTapInterval(150 * 1000000LL), // 150 ms
	pointerGestureTapDragInterval(150 * 1000000LL), // 150 ms
	pointerGestureTapSlop(10.0f), // 10 pixels
	pointerGestureMultitouchSettleInterval(100 * 1000000LL), // 100 ms
	pointerGestureMultitouchMinDistance(15), // 15 pixels
	pointerGestureSwipeTransitionAngleCosine(0.2588f), // cosine of 75 degrees
	pointerGestureSwipeMaxWidthRatio(0.25f),
	pointerGestureMovementSpeedRatio(0.8f),
	pointerGestureZoomSpeedRatio(0.3f),
	pointerCaptureRequest(),		pointerCaptureRequest(),
	touchpadPointerSpeed(0),		touchpadPointerSpeed(0),
	touchpadNaturalScrollingEnabled(true),		touchpadNaturalScrollingEnabled(true),

services/inputflinger/reader/InputReader.cpp

+0 −28

Original line number	Original line	Diff line number	Diff line
	@@ -991,14 +991,6 @@ void InputReader::dumpLocked(std::string& dump) {
	dump += StringPrintf(INDENT2 "VirtualKeyQuietTime: %0.1fms\n",		dump += StringPrintf(INDENT2 "VirtualKeyQuietTime: %0.1fms\n",
	mConfig.virtualKeyQuietTime * 0.000001f);		mConfig.virtualKeyQuietTime * 0.000001f);

	dump += StringPrintf(INDENT2 "PointerVelocityControlParameters: "
	"scale=%0.3f, lowThreshold=%0.3f, highThreshold=%0.3f, "
	"acceleration=%0.3f\n",
	mConfig.pointerVelocityControlParameters.scale,
	mConfig.pointerVelocityControlParameters.lowThreshold,
	mConfig.pointerVelocityControlParameters.highThreshold,
	mConfig.pointerVelocityControlParameters.acceleration);

	dump += StringPrintf(INDENT2 "WheelVelocityControlParameters: "		dump += StringPrintf(INDENT2 "WheelVelocityControlParameters: "
	"scale=%0.3f, lowThreshold=%0.3f, highThreshold=%0.3f, "		"scale=%0.3f, lowThreshold=%0.3f, highThreshold=%0.3f, "
	"acceleration=%0.3f\n",		"acceleration=%0.3f\n",
	@@ -1009,26 +1001,6 @@ void InputReader::dumpLocked(std::string& dump) {

	dump += StringPrintf(INDENT2 "PointerGesture:\n");		dump += StringPrintf(INDENT2 "PointerGesture:\n");
	dump += StringPrintf(INDENT3 "Enabled: %s\n", toString(mConfig.pointerGesturesEnabled));		dump += StringPrintf(INDENT3 "Enabled: %s\n", toString(mConfig.pointerGesturesEnabled));
	dump += StringPrintf(INDENT3 "QuietInterval: %0.1fms\n",
	mConfig.pointerGestureQuietInterval * 0.000001f);
	dump += StringPrintf(INDENT3 "DragMinSwitchSpeed: %0.1fpx/s\n",
	mConfig.pointerGestureDragMinSwitchSpeed);
	dump += StringPrintf(INDENT3 "TapInterval: %0.1fms\n",
	mConfig.pointerGestureTapInterval * 0.000001f);
	dump += StringPrintf(INDENT3 "TapDragInterval: %0.1fms\n",
	mConfig.pointerGestureTapDragInterval * 0.000001f);
	dump += StringPrintf(INDENT3 "TapSlop: %0.1fpx\n", mConfig.pointerGestureTapSlop);
	dump += StringPrintf(INDENT3 "MultitouchSettleInterval: %0.1fms\n",
	mConfig.pointerGestureMultitouchSettleInterval * 0.000001f);
	dump += StringPrintf(INDENT3 "MultitouchMinDistance: %0.1fpx\n",
	mConfig.pointerGestureMultitouchMinDistance);
	dump += StringPrintf(INDENT3 "SwipeTransitionAngleCosine: %0.1f\n",
	mConfig.pointerGestureSwipeTransitionAngleCosine);
	dump += StringPrintf(INDENT3 "SwipeMaxWidthRatio: %0.1f\n",
	mConfig.pointerGestureSwipeMaxWidthRatio);
	dump += StringPrintf(INDENT3 "MovementSpeedRatio: %0.1f\n",
	mConfig.pointerGestureMovementSpeedRatio);
	dump += StringPrintf(INDENT3 "ZoomSpeedRatio: %0.1f\n", mConfig.pointerGestureZoomSpeedRatio);

	dump += INDENT3 "Viewports:\n";		dump += INDENT3 "Viewports:\n";
	mConfig.dump(dump);		mConfig.dump(dump);

services/inputflinger/tests/FakeInputReaderPolicy.cpp

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -216,14 +216,6 @@ void FakeInputReaderPolicy::setPointerGestureEnabled(bool enabled) {
	mConfig.pointerGesturesEnabled = enabled;		mConfig.pointerGesturesEnabled = enabled;
	}		}

	float FakeInputReaderPolicy::getPointerGestureMovementSpeedRatio() {
	return mConfig.pointerGestureMovementSpeedRatio;
	}

	float FakeInputReaderPolicy::getPointerGestureZoomSpeedRatio() {
	return mConfig.pointerGestureZoomSpeedRatio;
	}

	void FakeInputReaderPolicy::setVelocityControlParams(const VelocityControlParameters& params) {		void FakeInputReaderPolicy::setVelocityControlParams(const VelocityControlParameters& params) {
	mConfig.wheelVelocityControlParameters = params;		mConfig.wheelVelocityControlParameters = params;
	}		}

services/inputflinger/tests/FakeInputReaderPolicy.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -72,8 +72,6 @@ public:
	PointerCaptureRequest setPointerCapture(const sp<IBinder>& window);		PointerCaptureRequest setPointerCapture(const sp<IBinder>& window);
	void setDefaultPointerDisplayId(ui::LogicalDisplayId pointerDisplayId);		void setDefaultPointerDisplayId(ui::LogicalDisplayId pointerDisplayId);
	void setPointerGestureEnabled(bool enabled);		void setPointerGestureEnabled(bool enabled);
	float getPointerGestureMovementSpeedRatio();
	float getPointerGestureZoomSpeedRatio();
	void setVelocityControlParams(const VelocityControlParameters& params);		void setVelocityControlParams(const VelocityControlParameters& params);
	void setStylusButtonMotionEventsEnabled(bool enabled);		void setStylusButtonMotionEventsEnabled(bool enabled);
	void setStylusPointerIconEnabled(bool enabled);		void setStylusPointerIconEnabled(bool enabled);