Merge "Rename the disable_shade_expands_on_trackpad_two_finger_swipe flag" into main (82eeff91) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+10 −10

Original line number	Diff line number	Diff line
		@@ -1794,16 +1794,6 @@ flag {
		bug: "371224114"
		}

		flag {
		name: "disable_shade_expands_on_trackpad_two_finger_swipe"
		namespace: "systemui"
		description: "Disables expansion of the shade via two finger swipe on a trackpad"
		bug: "356804470"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "keyboard_shortcut_helper_shortcut_customizer"
		namespace: "systemui"
		@@ -1904,6 +1894,16 @@ flag {
		bug: "382531177"
		}

		flag {
		name: "disable_shade_trackpad_two_finger_swipe"
		namespace: "systemui"
		description: "Disables expansion of the shade via two finger swipe on a trackpad"
		bug: "356804470"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "notification_magic_actions_treatment"
		namespace: "systemui"

+1 −1

Original line number	Diff line number	Diff line
		@@ -3959,7 +3959,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
		}

		final boolean isTrackpadThreeFingerSwipe = isTrackpadThreeFingerSwipe(event);
		if (com.android.systemui.Flags.disableShadeExpandsOnTrackpadTwoFingerSwipe()
		if (com.android.systemui.Flags.disableShadeTrackpadTwoFingerSwipe()
		&& !isTrackpadThreeFingerSwipe && isTwoFingerSwipeTrackpadEvent(event)
		&& !isPanelExpanded()) {
		if (isDown) {