Merge "Apply gesture exclusion only when not transitionin" into main (d683113a) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsShadeOverlay.kt

+20 −12

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ import com.android.compose.animation.scene.ContentScope
		import com.android.compose.animation.scene.ElementKey
		import com.android.compose.animation.scene.UserAction
		import com.android.compose.animation.scene.UserActionResult
		import com.android.compose.animation.scene.content.state.TransitionState
		import com.android.compose.modifiers.thenIf
		import com.android.systemui.brightness.ui.compose.BrightnessSliderContainer
		import com.android.systemui.compose.modifiers.sysuiResTag
		import com.android.systemui.dagger.SysUISingleton
		@@ -258,7 +260,11 @@ fun ContentScope.QuickSettingsLayout(
		BrightnessSliderContainer(
		viewModel = viewModel.brightnessSliderViewModel,
		containerColor = OverlayShade.Colors.PanelBackground,
		modifier = Modifier.systemGestureExclusionInShade().fillMaxWidth(),
		modifier =
		Modifier.systemGestureExclusionInShade(
		enabled = { layoutState.transitionState is TransitionState.Idle }
		)
		.fillMaxWidth(),
		)

		Box {
		@@ -289,9 +295,10 @@ object QuickSettingsShade {
		* right.
		*/
		@Composable
		fun Modifier.systemGestureExclusionInShade(): Modifier {
		fun Modifier.systemGestureExclusionInShade(enabled: () -> Boolean): Modifier {
		val density = LocalDensity.current
		return systemGestureExclusion { layoutCoordinates ->
		return thenIf(enabled()) {
		Modifier.systemGestureExclusion { layoutCoordinates ->
		val sidePadding = with(density) { Dimensions.Padding.toPx() }
		Rect(
		offset = Offset(x = -sidePadding, y = 0f),
		@@ -304,3 +311,4 @@ object QuickSettingsShade {
		}
		}
		}
		}

+7 −1

Original line number	Diff line number	Diff line
		@@ -743,7 +743,13 @@ constructor(
		BrightnessSliderContainer(
		viewModel = containerViewModel.brightnessSliderViewModel,
		modifier =
		Modifier.systemGestureExclusionInShade().fillMaxWidth(),
		Modifier.systemGestureExclusionInShade(
		enabled = {
		layoutState.transitionState is
		TransitionState.Idle
		}
		)
		.fillMaxWidth(),
		)
		}
		val TileGrid =