Merge "Fix UMO visibility in two locations during transition in QS" into main (c6b1db22) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/remedia/ui/compose/Media.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -1417,7 +1417,7 @@ private interface AnimatedColorScheme {
		val background: Color
		}

		private object Media {
		object Media {

		/**
		* Scenes.
		@@ -1460,6 +1460,7 @@ private object Media {
		val NextButton = ElementKey("next")
		val SeekBarSlider = ElementKey("seek_bar_slider")
		val OutputSwitcherButton = ElementKey("output_switcher")
		val mediaCarousel = ElementKey("media_carousel")

		fun additionalActionButton(index: Int): ElementKey {
		return ElementKey("additional_action_$index")

+10 −8

Original line number	Diff line number	Diff line
		@@ -1391,7 +1391,7 @@ private fun Modifier.gesturesDisabled(disabled: Boolean) =
		}

		@Composable
		private fun MediaObject(
		private fun ContentScope.MediaObject(
		mediaHost: MediaHost,
		modifier: Modifier = Modifier,
		mediaLogger: MediaViewLogger,
		@@ -1401,13 +1401,15 @@ private fun MediaObject(
		update: UniqueObjectHostView.() -> Unit = {},
		) {
		if (Flags.mediaControlsInCompose()) {
		Element(key = Media.Elements.mediaCarousel, modifier = modifier) {
		Media(
		viewModelFactory = mediaViewModelFactory,
		presentationStyle = MediaPresentationStyle.Default,
		behavior = behavior,
		onDismissed = { mediaCarouselInteractor.onSwipeToDismiss() },
		modifier = modifier,
		modifier = Modifier,
		)
		}
		} else {
		Box {
		AndroidView(