Merge "Update widget editing highlight to match specs" into main (33ed4b4b) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt

+25 −8

Original line number	Diff line number	Diff line
		@@ -97,10 +97,15 @@ import androidx.compose.runtime.setValue
		import androidx.compose.ui.Alignment
		import androidx.compose.ui.ExperimentalComposeUiApi
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.draw.drawBehind
		import androidx.compose.ui.geometry.CornerRadius
		import androidx.compose.ui.geometry.Offset
		import androidx.compose.ui.geometry.Size
		import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.graphics.ColorFilter
		import androidx.compose.ui.graphics.ColorMatrix
		import androidx.compose.ui.graphics.SolidColor
		import androidx.compose.ui.graphics.drawscope.Stroke
		import androidx.compose.ui.graphics.graphicsLayer
		import androidx.compose.ui.input.pointer.pointerInput
		import androidx.compose.ui.layout.LayoutCoordinates
		@@ -136,7 +141,6 @@ import com.android.internal.R.dimen.system_app_widget_background_radius
		import com.android.systemui.communal.domain.model.CommunalContentModel
		import com.android.systemui.communal.shared.model.CommunalContentSize
		import com.android.systemui.communal.shared.model.CommunalScenes
		import com.android.systemui.communal.ui.compose.Dimensions.CardOutlineWidth
		import com.android.systemui.communal.ui.compose.extensions.allowGestures
		import com.android.systemui.communal.ui.compose.extensions.detectLongPressGesture
		import com.android.systemui.communal.ui.compose.extensions.firstItemAtOffset
		@@ -820,13 +824,26 @@ private fun CommunalContent(

		/** Creates an empty card used to highlight a particular spot on the grid. */
		@Composable
		fun HighlightedItem(modifier: Modifier = Modifier) {
		Card(
		modifier = modifier,
		colors = CardDefaults.cardColors(containerColor = Color.Transparent),
		border = BorderStroke(CardOutlineWidth, LocalAndroidColorScheme.current.tertiaryFixed),
		shape = RoundedCornerShape(16.dp)
		) {}
		fun HighlightedItem(modifier: Modifier = Modifier, alpha: Float = 1.0f) {
		val brush = SolidColor(LocalAndroidColorScheme.current.primaryFixed)
		Box(
		modifier =
		// drawBehind lets us draw outside the bounds of the widgets so that we don't need to
		// resize grid items to account for the border.
		modifier.drawBehind {
		// 8dp of padding between the widget and the highlight on every side.
		val padding = 8.dp.toPx()
		drawRoundRect(
		brush,
		alpha = alpha,
		topLeft = Offset(-padding, -padding),
		size =
		Size(width = size.width + padding * 2, height = size.height + padding * 2),
		cornerRadius = CornerRadius(37.dp.toPx()),
		style = Stroke(width = 3.dp.toPx())
		)
		}
		)
		}

		/** Presents a CTA tile at the end of the grid, to customize the hub. */

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/GridDragDropState.kt

+14 −24

Original line number	Diff line number	Diff line
		@@ -16,10 +16,9 @@

		package com.android.systemui.communal.ui.compose

		import androidx.compose.animation.AnimatedVisibility
		import androidx.compose.animation.core.Spring
		import androidx.compose.animation.core.animateFloatAsState
		import androidx.compose.animation.fadeIn
		import androidx.compose.animation.fadeOut
		import androidx.compose.animation.core.spring
		import androidx.compose.foundation.ExperimentalFoundationApi
		import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress
		import androidx.compose.foundation.gestures.scrollBy
		@@ -34,13 +33,10 @@ import androidx.compose.runtime.mutableStateOf
		import androidx.compose.runtime.remember
		import androidx.compose.runtime.rememberCoroutineScope
		import androidx.compose.runtime.setValue
		import androidx.compose.ui.ExperimentalComposeUiApi
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.geometry.Offset
		import androidx.compose.ui.graphics.graphicsLayer
		import androidx.compose.ui.input.pointer.pointerInput
		import androidx.compose.ui.input.pointer.pointerInteropFilter
		import androidx.compose.ui.semantics.clearAndSetSemantics
		import androidx.compose.ui.unit.IntOffset
		import androidx.compose.ui.unit.toOffset
		import androidx.compose.ui.unit.toSize
		@@ -107,8 +103,7 @@ internal constructor(
		get() =
		draggingItemLayoutInfo?.let { item ->
		draggingItemInitialOffset + draggingItemDraggedDelta - item.offset.toOffset()
		}
		?: Offset.Zero
		} ?: Offset.Zero

		private val draggingItemLayoutInfo: LazyGridItemInfo?
		get() = state.layoutInfo.visibleItemsInfo.firstOrNull { it.index == draggingItemIndex }
		@@ -238,7 +233,6 @@ fun Modifier.dragContainer(
		}

		/** Wrap LazyGrid item with additional modifier needed for drag and drop. */
		@OptIn(ExperimentalComposeUiApi::class)
		@ExperimentalFoundationApi
		@Composable
		fun LazyGridItemScope.DraggableItem(
		@@ -270,22 +264,18 @@ fun LazyGridItemScope.DraggableItem(
		Modifier.animateItemPlacement()
		}

		// Animate the highlight alpha manually as alpha modifier (and AnimatedVisibility) clips the
		// widget to bounds, which cuts off the highlight as we are drawing outside the widget bounds.
		val alpha by
		animateFloatAsState(
		targetValue =
		if ((dragging \|\| selected) && !dragDropState.isDraggingToRemove) 1f else 0f,
		animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
		label = "Widget outline alpha"
		)

		Box(modifier) {
		HighlightedItem(Modifier.matchParentSize(), alpha = alpha)
		Box(draggingModifier) { content(dragging) }
		AnimatedVisibility(
		modifier =
		Modifier.matchParentSize()
		// Avoid taking focus away from the content when using explore-by-touch with
		// accessibility tools.
		.clearAndSetSemantics {}
		// Do not consume motion events in the highlighted item and pass them down to
		// the content.
		.pointerInteropFilter { false },
		visible = (dragging \|\| selected) && !dragDropState.isDraggingToRemove,
		enter = fadeIn(),
		exit = fadeOut()
		) {
		HighlightedItem(Modifier.matchParentSize())
		}
		}
		}