diff options
| author | 2025-02-06 13:45:12 -0800 | |
|---|---|---|
| committer | 2025-02-06 13:45:12 -0800 | |
| commit | a10033c1448540e41435437ef19d7844b27a69ed (patch) | |
| tree | 0fd4fa8064eadc10a7d78ea7ed212e442b54aeca | |
| parent | 4c8649b8ad2d97def7e4734e554b426c7aade07c (diff) | |
| parent | c7b91f5d00f250ad9225e6b7a9af612db5f2d365 (diff) | |
Merge "[Flexiglass] fix the missing settings button." into main
2 files changed, 10 insertions, 0 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/media/controls/ui/composable/MediaCarousel.kt b/packages/SystemUI/compose/features/src/com/android/systemui/media/controls/ui/composable/MediaCarousel.kt index f5de7dca6d9d..89f82a90c3b8 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/media/controls/ui/composable/MediaCarousel.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/media/controls/ui/composable/MediaCarousel.kt @@ -119,6 +119,8 @@ fun ContentScope.MediaCarousel( }, update = { MediaCarouselStateLoader.loadCarouselState(carouselController, carouselState()) + carouselController.mediaCarouselScrollHandler.showsSettingsButton = + !mediaHost.showsOnlyActiveMedia it.setView(carouselController.mediaFrame) }, onRelease = { it.removeAllViews() }, diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt index 62a8cc5a7fe3..061fdd99eb1b 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt @@ -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 |