Merge "Fix flash of QQS when collapsing in Keyguard" into main (5ddbc132) · Commits · e / os / android_frameworks_base

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

+49 −44

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import androidx.activity.OnBackPressedDispatcherOwner
		import androidx.activity.setViewTreeOnBackPressedDispatcherOwner
		import androidx.annotation.VisibleForTesting
		import androidx.compose.animation.AnimatedContent
		import androidx.compose.animation.AnimatedVisibility
		import androidx.compose.animation.core.tween
		import androidx.compose.animation.fadeIn
		import androidx.compose.animation.fadeOut
		@@ -246,23 +245,27 @@ constructor(
		private fun Content() {
		PlatformTheme(isDarkTheme = true) {
		ProvideShortcutHelperIndication(interactionsConfig = interactionsConfig()) {
		AnimatedVisibility(
		visible = viewModel.isQsVisibleAndAnyShadeExpanded,
		if (viewModel.isQsVisibleAndAnyShadeExpanded) {
		Box(
		modifier =
		Modifier.graphicsLayer { alpha = viewModel.viewAlpha }
		// Clipping before translation to match QSContainerImpl.onDraw
		.offset {
		IntOffset(x = 0, y = viewModel.viewTranslationY.fastRoundToInt())
		IntOffset(
		x = 0,
		y = viewModel.viewTranslationY.fastRoundToInt(),
		)
		}
		.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 by the composables.
		.gesturesDisabled(viewModel.showingMirror),
		// 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
		// by the composables.
		.gesturesDisabled(viewModel.showingMirror)
		) {
		val isEditing by
		viewModel.containerViewModel.editModeViewModel.isEditing
		@@ -285,7 +288,8 @@ constructor(
		.padding(top = { qqsPadding })
		.padding(
		horizontal = {
		QuickSettingsShade.Dimensions.Padding.roundToPx()
		QuickSettingsShade.Dimensions.Padding
		.roundToPx()
		}
		),
		)
		@@ -297,6 +301,7 @@ constructor(
		}
		}
		}
		}

		/**
		* STL that contains both QQS (tiles) and QS (brightness, tiles, footer actions), but no Edit