Merge "Clear remove button coordinates when not enabled." into main (eb1bd418) · Commits · e / os / android_frameworks_base

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

+12 −2

Original line number	Diff line number	Diff line
		@@ -602,10 +602,14 @@ private fun Toolbar(
		removeEnabled: Boolean,
		onRemoveClicked: () -> Unit,
		setToolbarSize: (toolbarSize: IntSize) -> Unit,
		setRemoveButtonCoordinates: (coordinates: LayoutCoordinates) -> Unit,
		setRemoveButtonCoordinates: (coordinates: LayoutCoordinates?) -> Unit,
		onOpenWidgetPicker: () -> Unit,
		onEditDone: () -> Unit
		) {
		if (!removeEnabled) {
		// Clear any existing coordinates when remove is not enabled.
		setRemoveButtonCoordinates(null)
		}
		val removeButtonAlpha: Float by
		animateFloatAsState(
		targetValue = if (removeEnabled) 1f else 0.5f,
		@@ -645,7 +649,13 @@ private fun Toolbar(
		contentPadding = Dimensions.ButtonPadding,
		modifier =
		Modifier.graphicsLayer { alpha = removeButtonAlpha }
		.onGloballyPositioned { setRemoveButtonCoordinates(it) }
		.onGloballyPositioned {
		// It's possible for this callback to fire after remove has been
		// disabled. Check enabled state before setting.
		if (removeEnabled) {
		setRemoveButtonCoordinates(it)
		}
		}
		) {
		Row(
		horizontalArrangement =