Merge "Remove additional offset while clipping QS as we collapse the shade to hide QQS" into main (aac8e4ed) · Commits · e / os / android_frameworks_base

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

+9 −6

Original line number	Original line	Diff line number	Diff line
	@@ -102,6 +102,7 @@ import com.android.compose.modifiers.thenIf
	import com.android.compose.theme.PlatformTheme		import com.android.compose.theme.PlatformTheme
	import com.android.mechanics.GestureContext		import com.android.mechanics.GestureContext
	import com.android.systemui.Dumpable		import com.android.systemui.Dumpable
			import com.android.systemui.Flags
	import com.android.systemui.brightness.ui.compose.BrightnessSliderContainer		import com.android.systemui.brightness.ui.compose.BrightnessSliderContainer
	import com.android.systemui.compose.modifiers.sysuiResTag		import com.android.systemui.compose.modifiers.sysuiResTag
	import com.android.systemui.dump.DumpManager		import com.android.systemui.dump.DumpManager
	@@ -252,13 +253,15 @@ constructor(
	Box(		Box(
	modifier =		modifier =
	Modifier.graphicsLayer { alpha = viewModel.viewAlpha }		Modifier.graphicsLayer { alpha = viewModel.viewAlpha }
			.thenIf(!Flags.notificationShadeBlur()) {
	// Clipping before translation to match QSContainerImpl.onDraw		// Clipping before translation to match QSContainerImpl.onDraw
	.offset {		Modifier.offset {
	IntOffset(		IntOffset(
	x = 0,		x = 0,
	y = viewModel.viewTranslationY.fastRoundToInt(),		y = viewModel.viewTranslationY.fastRoundToInt(),
	)		)
	}		}
			}
	.thenIf(notificationScrimClippingParams.isEnabled) {		.thenIf(notificationScrimClippingParams.isEnabled) {
	Modifier.notificationScrimClip {		Modifier.notificationScrimClip {
	notificationScrimClippingParams.params		notificationScrimClippingParams.params