Merge "[Flexiglass] set media host expansion in flexi" into main (40b8be4a) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt

+10 −3

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ import androidx.compose.ui.graphics.graphicsLayer
		import androidx.compose.ui.input.pointer.pointerInteropFilter
		import androidx.compose.ui.layout.Layout
		import androidx.compose.ui.layout.layoutId
		import androidx.compose.ui.platform.LocalContext
		import androidx.compose.ui.platform.LocalDensity
		import androidx.compose.ui.platform.LocalLifecycleOwner
		import androidx.compose.ui.res.colorResource
		@@ -88,6 +89,8 @@ 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
		import com.android.systemui.media.controls.ui.view.MediaHostState.Companion.COLLAPSED
		import com.android.systemui.media.controls.ui.view.MediaHostState.Companion.EXPANDED
		import com.android.systemui.media.dagger.MediaModule.QS_PANEL
		import com.android.systemui.media.dagger.MediaModule.QUICK_QS_PANEL
		import com.android.systemui.notifications.ui.composable.NotificationScrollingStack
		@@ -110,6 +113,7 @@ import com.android.systemui.statusbar.notification.stack.ui.viewmodel.Notificati
		import com.android.systemui.statusbar.phone.StatusBarLocation
		import com.android.systemui.statusbar.phone.ui.StatusBarIconController
		import com.android.systemui.statusbar.phone.ui.TintedIconManager
		import com.android.systemui.util.Utils
		import dagger.Lazy
		import javax.inject.Inject
		import javax.inject.Named
		@@ -260,6 +264,11 @@ private fun SceneScope.SingleShade(
		shadeSession: SaveableSession,
		) {
		val cutoutLocation = LocalDisplayCutout.current.location
		val isLandscape = LocalWindowSizeClass.current.heightSizeClass == WindowHeightSizeClass.Compact
		val usingCollapsedLandscapeMedia =
		Utils.useCollapsedMediaInLandscape(LocalContext.current.resources)
		val isExpanded = !usingCollapsedLandscapeMedia \|\| !isLandscape
		mediaHost.expansion = if (isExpanded) EXPANDED else COLLAPSED

		val maxNotifScrimTop = remember { mutableStateOf(0f) }
		val tileSquishiness by
		@@ -275,9 +284,7 @@ private fun SceneScope.SingleShade(
		layoutState.isTransitioningBetween(Scenes.Gone, Scenes.Shade) \|\|
		layoutState.isTransitioningBetween(Scenes.Lockscreen, Scenes.Shade)
		// Media is visible and we are in landscape on a small height screen
		val mediaInRow =
		isMediaVisible &&
		LocalWindowSizeClass.current.heightSizeClass == WindowHeightSizeClass.Compact
		val mediaInRow = isMediaVisible && isLandscape
		val mediaOffset by
		animateSceneDpAsState(value = InQQS, key = MediaLandscapeTopOffset, canOverflow = false)

packages/SystemUI/src/com/android/systemui/qs/QuickQSPanelController.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import com.android.systemui.qs.customize.QSCustomizerController;
		import com.android.systemui.qs.dagger.QSScope;
		import com.android.systemui.qs.logging.QSLogger;
		import com.android.systemui.res.R;
		import com.android.systemui.scene.shared.flag.SceneContainerFlag;
		import com.android.systemui.statusbar.policy.SplitShadeStateController;
		import com.android.systemui.util.leak.RotationUtils;

		@@ -77,10 +78,12 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel>
		@Override
		protected void onInit() {
		super.onInit();
		if (!SceneContainerFlag.isEnabled()) {
		updateMediaExpansion();
		mMediaHost.setShowsOnlyActiveMedia(true);
		mMediaHost.init(MediaHierarchyManager.LOCATION_QQS);
		}
		}

		@Override
		StateFlow<Boolean> getMediaVisibleFlow() {
		@@ -125,8 +128,10 @@ public class QuickQSPanelController extends QSPanelControllerBase<QuickQSPanel>
		if (newMaxTiles != mView.getNumQuickTiles()) {
		setMaxTiles(newMaxTiles);
		}
		if (!SceneContainerFlag.isEnabled()) {
		updateMediaExpansion();
		}
		}

		@Override
		public void setTiles() {