Merge "Revert "TileGrid now includes an optional revealEffectContainer parameter"" into main (34a3c5ac) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/GridLayout.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.systemui.qs.panels.ui.compose
		import androidx.compose.runtime.Composable
		import androidx.compose.ui.Modifier
		import com.android.compose.animation.scene.ContentScope
		import com.android.compose.animation.scene.ElementKey
		import com.android.systemui.qs.panels.shared.model.SizedTile
		import com.android.systemui.qs.panels.shared.model.TileRow
		import com.android.systemui.qs.panels.ui.viewmodel.EditTileViewModel
		@@ -38,7 +37,6 @@ interface GridLayout {
		tiles: List<TileViewModel>,
		modifier: Modifier,
		listening: () -> Boolean,
		revealEffectContainer: ElementKey? = null,
		)

		@Composable

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/PaginatedGridLayout.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ import androidx.compose.ui.res.integerResource
		import androidx.compose.ui.unit.Velocity
		import androidx.compose.ui.unit.dp
		import com.android.compose.animation.scene.ContentScope
		import com.android.compose.animation.scene.ElementKey
		import com.android.compose.animation.scene.content.state.TransitionState
		import com.android.compose.modifiers.padding
		import com.android.systemui.common.ui.compose.PagerDots
		@@ -71,7 +70,6 @@ constructor(
		tiles: List<TileViewModel>,
		modifier: Modifier,
		listening: () -> Boolean,
		revealEffectContainer: ElementKey?,
		) {
		val viewModel =
		rememberViewModel(traceName = "PaginatedGridLayout-TileGrid") {

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/TileGrid.kt

+2 −15

Original line number	Diff line number	Diff line
		@@ -20,8 +20,6 @@ import androidx.compose.runtime.Composable
		import androidx.compose.ui.Modifier
		import com.android.compose.animation.scene.ContentScope
		import com.android.systemui.qs.panels.ui.viewmodel.TileGridViewModel
		import com.android.systemui.qs.ui.composable.QuickSettingsShade
		import com.android.systemui.scene.shared.flag.SceneContainerFlag

		@Composable
		fun ContentScope.TileGrid(
		@@ -31,17 +29,6 @@ fun ContentScope.TileGrid(
		) {
		val gridLayout = viewModel.gridLayout
		val tiles = viewModel.tileViewModels
		with(gridLayout) {
		TileGrid(
		tiles = tiles,
		modifier = modifier,
		listening = listening,
		revealEffectContainer =
		if (SceneContainerFlag.isUnexpectedlyInLegacyMode()) {
		null
		} else {
		QuickSettingsShade.Elements.Panel
		},
		)
		}

		with(gridLayout) { TileGrid(tiles, modifier, listening) }
		}

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt

+4 −5

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import androidx.compose.ui.res.dimensionResource
		import androidx.compose.ui.util.fastMap
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		import com.android.compose.animation.scene.ContentScope
		import com.android.compose.animation.scene.ElementKey
		import com.android.mechanics.compose.modifier.verticalTactileSurfaceReveal
		import com.android.mechanics.spec.builder.rememberMotionBuilderContext
		import com.android.systemui.dagger.SysUISingleton
		@@ -74,7 +73,6 @@ constructor(
		tiles: List<TileViewModel>,
		modifier: Modifier,
		listening: () -> Boolean,
		revealEffectContainer: ElementKey?,
		) {
		val viewModel =
		rememberViewModel(traceName = "InfiniteGridLayout.TileGrid") {
		@@ -111,6 +109,7 @@ constructor(
		val scope = rememberCoroutineScope()
		val spans by remember(sizedTiles) { derivedStateOf { sizedTiles.fastMap { it.width } } }

		val isDualShade = viewModel.isDualShade
		val motionBuilderContext = rememberMotionBuilderContext()
		val marginBottom =
		with(LocalDensity.current) { QuickSettingsShade.Dimensions.Padding.toPx() }
		@@ -145,17 +144,17 @@ constructor(
		isVisible = listening,
		requestToggleTextFeedback = textFeedbackViewModel::requestShowFeedback,
		modifier =
		if (revealEffectContainer != null) {
		if (isDualShade) {
		Modifier.verticalTactileSurfaceReveal(
		contentScope = this@TileGrid,
		motionBuilderContext = motionBuilderContext,
		container = revealEffectContainer,
		container = QuickSettingsShade.Elements.Panel,
		deltaY = -marginBottom,
		)
		} else {
		Modifier
		},
		revealEffectContainer = revealEffectContainer,
		verticalFadeContentReveal = isDualShade,
		)
		}
		}

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -76,7 +76,6 @@ import com.android.compose.animation.Expandable
		import com.android.compose.animation.bounceable
		import com.android.compose.animation.rememberExpandableController
		import com.android.compose.animation.scene.ContentScope
		import com.android.compose.animation.scene.ElementKey
		import com.android.compose.modifiers.thenIf
		import com.android.compose.theme.LocalAndroidColorScheme
		import com.android.mechanics.compose.modifier.verticalFadeContentReveal
		@@ -102,6 +101,7 @@ import com.android.systemui.qs.panels.ui.viewmodel.toIconProvider
		import com.android.systemui.qs.panels.ui.viewmodel.toUiState
		import com.android.systemui.qs.pipeline.shared.TileSpec
		import com.android.systemui.qs.tileimpl.QSTileImpl
		import com.android.systemui.qs.ui.composable.QuickSettingsShade
		import com.android.systemui.qs.ui.compose.borderOnFocus
		import com.android.systemui.res.R
		import kotlinx.coroutines.CoroutineScope
		@@ -143,7 +143,7 @@ fun ContentScope.Tile(
		isVisible: () -> Boolean = { true },
		requestToggleTextFeedback: (TileSpec) -> Unit = {},
		detailsViewModel: DetailsViewModel?,
		revealEffectContainer: ElementKey? = null,
		verticalFadeContentReveal: Boolean = false,
		) {
		trace(tile.traceName) {
		val currentBounceableInfo by rememberUpdatedState(bounceableInfo)
		@@ -252,11 +252,11 @@ fun ContentScope.Tile(
		iconOnly = iconOnly,
		isDualTarget = isDualTarget,
		modifier =
		if (revealEffectContainer != null) {
		if (verticalFadeContentReveal) {
		Modifier.verticalFadeContentReveal(
		contentScope = this,
		motionBuilderContext = rememberMotionBuilderContext(),
		container = revealEffectContainer,
		container = QuickSettingsShade.Elements.Panel,
		)
		} else {
		Modifier