Merge "Migrate to LocalOverscrollFactory" into main (7c73f6a3) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ import androidx.compose.animation.core.animateFloatAsState
		import androidx.compose.animation.fadeIn
		import androidx.compose.animation.fadeOut
		import androidx.compose.foundation.ExperimentalFoundationApi
		import androidx.compose.foundation.LocalOverscrollConfiguration
		import androidx.compose.foundation.LocalOverscrollFactory
		import androidx.compose.foundation.background
		import androidx.compose.foundation.border
		import androidx.compose.foundation.gestures.Orientation
		@@ -203,7 +203,7 @@ fun DefaultEditTileGrid(
		containerColor = Color.Transparent,
		topBar = { EditModeTopBar(onStopEditing = onStopEditing, onReset = reset) },
		) { innerPadding ->
		CompositionLocalProvider(LocalOverscrollConfiguration provides null) {
		CompositionLocalProvider(LocalOverscrollFactory provides null) {
		val scrollState = rememberScrollState()
		LaunchedEffect(listState.dragInProgress) {
		if (listState.dragInProgress) {

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

+11 −16

Original line number	Diff line number	Diff line
		@@ -156,6 +156,14 @@ fun Tile(
		bounceEnd = currentBounceableInfo.bounceEnd,
		),
		) { expandable ->
		val longClick: (() -> Unit)? =
		{
		hapticsViewModel?.setTileInteractionState(
		TileHapticsViewModel.TileInteractionState.LONG_CLICKED
		)
		tile.onLongClick(expandable)
		}
		.takeIf { uiState.handlesLongClick }
		TileContainer(
		onClick = {
		tile.onClick(expandable)
		@@ -166,12 +174,7 @@ fun Tile(
		coroutineScope.launch { currentBounceableInfo.bounceable.animateBounce() }
		}
		},
		onLongClick = {
		hapticsViewModel?.setTileInteractionState(
		TileHapticsViewModel.TileInteractionState.LONG_CLICKED
		)
		tile.onLongClick(expandable)
		},
		onLongClick = longClick,
		uiState = uiState,
		iconOnly = iconOnly,
		) {
		@@ -192,14 +195,6 @@ fun Tile(
		tile.onSecondaryClick()
		}
		.takeIf { uiState.handlesSecondaryClick }
		val longClick: (() -> Unit)? =
		{
		hapticsViewModel?.setTileInteractionState(
		TileHapticsViewModel.TileInteractionState.LONG_CLICKED
		)
		tile.onLongClick(expandable)
		}
		.takeIf { uiState.handlesLongClick }
		LargeTileContent(
		label = uiState.label,
		secondaryLabel = uiState.secondaryLabel,
		@@ -237,7 +232,7 @@ private fun TileExpandable(
		@Composable
		fun TileContainer(
		onClick: () -> Unit,
		onLongClick: () -> Unit,
		onLongClick: (() -> Unit)?,
		uiState: TileUiState,
		iconOnly: Boolean,
		content: @Composable BoxScope.() -> Unit,
		@@ -281,7 +276,7 @@ fun Modifier.tilePadding(): Modifier {
		@Composable
		fun Modifier.tileCombinedClickable(
		onClick: () -> Unit,
		onLongClick: () -> Unit,
		onLongClick: (() -> Unit)?,
		uiState: TileUiState,
		iconOnly: Boolean,
		): Modifier {