Merge "Instrument dialog/app launches when animating from Compose UIs" into main (fe0f2dd3) · Commits · e / os / android_frameworks_base

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -263,9 +263,11 @@ internal class ExpandableControllerImpl(
		override fun onLaunchAnimationStart(isExpandingFullyAbove: Boolean) {
		delegate.onLaunchAnimationStart(isExpandingFullyAbove)
		overlay.value = composeViewRoot.rootView.overlay as ViewGroupOverlay
		cujType?.let { InteractionJankMonitor.getInstance().begin(composeViewRoot, it) }
		}

		override fun onLaunchAnimationEnd(isExpandingFullyAbove: Boolean) {
		cujType?.let { InteractionJankMonitor.getInstance().end(it) }
		delegate.onLaunchAnimationEnd(isExpandingFullyAbove)
		overlay.value = null
		}
		@@ -320,9 +322,8 @@ internal class ExpandableControllerImpl(
		}

		override fun jankConfigurationBuilder(): InteractionJankMonitor.Configuration.Builder? {
		// TODO(b/252723237): Add support for jank monitoring when animating from a
		// Composable.
		return null
		val type = cuj?.cujType ?: return null
		return InteractionJankMonitor.Configuration.Builder.withView(type, composeViewRoot)
		}
		}
		}