Snap for 12602378 from 870583074c379f72e4d4258210e292d2a5037487 to 25Q1-release (3259841d) · Commits · e / os / android_frameworks_native

cmds/dumpstate/dumpstate.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -1841,6 +1841,11 @@ Dumpstate::RunStatus Dumpstate::dumpstate() {
		RunCommand("DUMP VENDOR RIL LOGS", {"vril-dump"}, options.Build());
		}

		/* Dump USB information */
		RunCommand("typec_connector_class", {"typec_connector_class"},
		CommandOptions::WithTimeout(10).AsRootIfAvailable().Build());
		RunCommand("lsusb", {"lsusb"}, CommandOptions::WithTimeout(10).AsRootIfAvailable().Build());

		printf("========================================================\n");
		printf("== Android Framework Services\n");
		printf("========================================================\n");

+7 −0

Original line number	Diff line number	Diff line
		@@ -242,6 +242,9 @@ struct InputReaderConfiguration {
		// context (a.k.a. "right") clicks.
		bool touchpadRightClickZoneEnabled;

		// True to use three-finger tap as a customizable shortcut; false to use it as a middle-click.
		bool touchpadThreeFingerTapShortcutEnabled;

		// The set of currently disabled input devices.
		std::set<int32_t> disabledDevices;

		@@ -293,6 +296,7 @@ struct InputReaderConfiguration {
		touchpadTapDraggingEnabled(false),
		shouldNotifyTouchpadHardwareState(false),
		touchpadRightClickZoneEnabled(false),
		touchpadThreeFingerTapShortcutEnabled(false),
		stylusButtonMotionEventsEnabled(true),
		stylusPointerIconEnabled(false),
		mouseReverseVerticalScrollingEnabled(false),
		@@ -496,6 +500,9 @@ public:
		/* Sends the Info of gestures that happen on the touchpad. */
		virtual void notifyTouchpadGestureInfo(GestureType type, int32_t deviceId) = 0;

		/* Notifies the policy that the user has performed a three-finger touchpad tap. */
		virtual void notifyTouchpadThreeFingerTap() = 0;

		/* Gets the keyboard layout for a particular input device. */
		virtual std::shared_ptr<KeyCharacterMap> getKeyboardLayoutOverlay(
		const InputDeviceIdentifier& identifier,

+3 −0

Original line number	Diff line number	Diff line
		@@ -375,6 +375,9 @@ std::list<NotifyArgs> TouchpadInputMapper::reconfigure(nsecs_t when,
		mPropertyProvider.getProperty("Button Right Click Zone Enable")
		.setBoolValues({config.touchpadRightClickZoneEnabled});
		mTouchpadHardwareStateNotificationsEnabled = config.shouldNotifyTouchpadHardwareState;

		mGestureConverter.setThreeFingerTapShortcutEnabled(
		config.touchpadThreeFingerTapShortcutEnabled);
		}
		std::list<NotifyArgs> out;
		if ((!changes.any() && config.pointerCaptureRequest.isEnable()) \|\|

+8 −1

Original line number	Diff line number	Diff line
		@@ -261,6 +261,14 @@ std::list<NotifyArgs> GestureConverter::handleButtonsChange(nsecs_t when, nsecs_
		}

		const uint32_t buttonsPressed = gesture.details.buttons.down;
		const uint32_t buttonsReleased = gesture.details.buttons.up;

		if (mThreeFingerTapShortcutEnabled && gesture.details.buttons.is_tap &&
		buttonsPressed == GESTURES_BUTTON_MIDDLE && buttonsReleased == GESTURES_BUTTON_MIDDLE) {
		mReaderContext.getPolicy()->notifyTouchpadThreeFingerTap();
		return out;
		}

		bool pointerDown = isPointerDown(mButtonState) \|\|
		buttonsPressed &
		(GESTURES_BUTTON_LEFT \| GESTURES_BUTTON_MIDDLE \| GESTURES_BUTTON_RIGHT);
		@@ -291,7 +299,6 @@ std::list<NotifyArgs> GestureConverter::handleButtonsChange(nsecs_t when, nsecs_
		// changes: a set of buttons going down, followed by a set of buttons going up.
		mButtonState = newButtonState;

		const uint32_t buttonsReleased = gesture.details.buttons.up;
		for (uint32_t button = 1; button <= GESTURES_BUTTON_FORWARD; button <<= 1) {
		if (buttonsReleased & button) {
		uint32_t actionButton = gesturesButtonToMotionEventButton(button);

+6 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,10 @@ public:

		void setBoundsInLogicalDisplay(FloatRect bounds) { mBoundsInLogicalDisplay = bounds; }

		void setThreeFingerTapShortcutEnabled(bool enabled) {
		mThreeFingerTapShortcutEnabled = enabled;
		}

		void populateMotionRanges(InputDeviceInfo& info) const;

		[[nodiscard]] std::list<NotifyArgs> handleGesture(nsecs_t when, nsecs_t readTime,
		@@ -101,6 +105,8 @@ private:
		const bool mEnableFlingStop;
		const bool mEnableNoFocusChange;

		bool mThreeFingerTapShortcutEnabled;

		std::optional<ui::LogicalDisplayId> mDisplayId;
		FloatRect mBoundsInLogicalDisplay{};
		ui::Rotation mOrientation = ui::ROTATION_0;