Merge "InputMapper refactor: RotaryEncoderInputMapper" (1356c2f9) · Commits · e / os / platform_frameworks_native

services/inputflinger/reader/InputDevice.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -451,7 +451,7 @@ std::vector<std::unique_ptr<InputMapper>> InputDevice::createMappers(

		// Scroll wheel-like devices.
		if (classes.test(InputDeviceClass::ROTARY_ENCODER)) {
		mappers.push_back(std::make_unique<RotaryEncoderInputMapper>(contextPtr, readerConfig));
		mappers.push_back(createInputMapper<RotaryEncoderInputMapper>(contextPtr, readerConfig));
		}

		// Vibrator-like devices.

+6 −2

Original line number	Diff line number	Diff line
		@@ -25,8 +25,10 @@ namespace android {

		class RotaryEncoderInputMapper : public InputMapper {
		public:
		explicit RotaryEncoderInputMapper(InputDeviceContext& deviceContext,
		const InputReaderConfiguration& readerConfig);
		template <class T, class... Args>
		friend std::unique_ptr<T> createInputMapper(InputDeviceContext& deviceContext,
		const InputReaderConfiguration& readerConfig,
		Args... args);
		virtual ~RotaryEncoderInputMapper();

		virtual uint32_t getSources() const override;
		@@ -45,6 +47,8 @@ private:
		float mScalingFactor;
		ui::Rotation mOrientation;

		explicit RotaryEncoderInputMapper(InputDeviceContext& deviceContext,
		const InputReaderConfiguration& readerConfig);
		[[nodiscard]] std::list<NotifyArgs> sync(nsecs_t when, nsecs_t readTime);
		};