Merge "[Flexiglass] fix the missing settings button." into main (a10033c1) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/media/controls/ui/composable/MediaCarousel.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,8 @@ fun ContentScope.MediaCarousel(
		},
		update = {
		MediaCarouselStateLoader.loadCarouselState(carouselController, carouselState())
		carouselController.mediaCarouselScrollHandler.showsSettingsButton =
		!mediaHost.showsOnlyActiveMedia
		it.setView(carouselController.mediaFrame)
		},
		onRelease = { it.removeAllViews() },

+8 −0

Original line number	Diff line number	Diff line
		@@ -84,7 +84,9 @@ import com.android.systemui.lifecycle.rememberViewModel
		import com.android.systemui.media.controls.ui.composable.MediaCarousel
		import com.android.systemui.media.controls.ui.composable.isLandscape
		import com.android.systemui.media.controls.ui.controller.MediaCarouselController
		import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager
		import com.android.systemui.media.controls.ui.view.MediaHost
		import com.android.systemui.media.controls.ui.view.MediaHostState.Companion.EXPANDED
		import com.android.systemui.media.dagger.MediaModule
		import com.android.systemui.notifications.ui.composable.HeadsUpNotificationSpace
		import com.android.systemui.notifications.ui.composable.NotificationScrollingStack
		@@ -165,6 +167,12 @@ constructor(
		shadeSession = shadeSession,
		)
		}

		init {
		mediaHost.expansion = EXPANDED
		mediaHost.showsOnlyActiveMedia = false
		mediaHost.init(MediaHierarchyManager.LOCATION_QS)
		}
		}

		@Composable