Merge "Fix QS notification scrim clipping being affected by offset" into main (9bbb3032) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt

+5 −6

Original line number	Diff line number	Diff line
		@@ -252,8 +252,12 @@ constructor(
		Box(
		modifier =
		Modifier.graphicsLayer { alpha = viewModel.viewAlpha }
		.thenIf(notificationScrimClippingParams.isEnabled) {
		Modifier.notificationScrimClip {
		notificationScrimClippingParams.params
		}
		}
		.thenIf(!Flags.notificationShadeBlur()) {
		// Clipping before translation to match QSContainerImpl.onDraw
		Modifier.offset {
		IntOffset(
		x = 0,
		@@ -261,11 +265,6 @@ constructor(
		)
		}
		}
		.thenIf(notificationScrimClippingParams.isEnabled) {
		Modifier.notificationScrimClip {
		notificationScrimClippingParams.params
		}
		}
		// Disable touches in the whole composable while the mirror is
		// showing. While the mirror is showing, an ancestor of the
		// ComposeView is made alpha 0, but touches are still being captured