Merge "Fix new Expandable animation lag" into main (e2820723) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -314,7 +314,7 @@ private fun Modifier.expandable(
		if (isAnimating) {
		val graphicsLayer = rememberGraphicsLayer()

		FullScreenComposeViewInOverlay { view ->
		FullScreenComposeViewInOverlay(controller.overlay) { view ->
		Modifier.then(DrawExpandableInOverlayElement(view, controller, graphicsLayer))
		}

		@@ -397,7 +397,7 @@ private class DrawExpandableInOverlayNode(
		}

		override fun ContentDrawScope.draw() {
		val state = controller.animatorState ?: return
		val state = controller.animatorState?.takeIf { it.visible } ?: return
		val topOffset = state.top.toFloat() - composeViewLocationOnScreen[1]
		val leftOffset = state.left.toFloat() - composeViewLocationOnScreen[0]

+6 −3

Original line number	Diff line number	Diff line
		@@ -47,15 +47,18 @@ fun Modifier.drawInOverlay(): Modifier {
		}

		@Composable
		internal fun FullScreenComposeViewInOverlay(modifier: (ComposeView) -> Modifier = { Modifier }) {
		internal fun FullScreenComposeViewInOverlay(
		overlay: ViewGroupOverlay? = null,
		modifier: (ComposeView) -> Modifier = { Modifier },
		) {
		val context = LocalContext.current
		val localView = LocalView.current
		val compositionContext = rememberCompositionContext()
		val displayMetrics = context.resources.displayMetrics
		val displaySize = IntSize(displayMetrics.widthPixels, displayMetrics.heightPixels)
		val overlay = overlay ?: localView.rootView.overlay as ViewGroupOverlay

		DisposableEffect(context, localView, compositionContext, displaySize) {
		val overlay = localView.rootView.overlay as ViewGroupOverlay
		DisposableEffect(context, localView, overlay, compositionContext, displaySize) {
		val view =
		ComposeView(context).apply {
		setParentCompositionContext(compositionContext)