Merge changes Ibe044e2b,Ife70fae8 into main (48a65b4b) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/facade/enabled/src/com/android/systemui/scene/EditSceneModule.kt

deleted100644 → 0

+0 −28

Original line number	Diff line number	Diff line
		/*
		* Copyright 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.scene

		import com.android.systemui.qs.ui.composable.EditModeScene
		import com.android.systemui.scene.ui.composable.Scene
		import dagger.Binds
		import dagger.Module
		import dagger.multibindings.IntoSet

		@Module
		interface EditSceneModule {
		@Binds @IntoSet fun editModeScene(scene: EditModeScene): Scene
		}

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/EditModeScene.kt

deleted100644 → 0

+0 −87

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.qs.ui.composable

		import androidx.compose.foundation.background
		import androidx.compose.foundation.layout.Box
		import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.foundation.layout.padding
		import androidx.compose.runtime.Composable
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.platform.testTag
		import androidx.compose.ui.res.colorResource
		import com.android.compose.animation.scene.ContentScope
		import com.android.compose.animation.scene.UserAction
		import com.android.compose.animation.scene.UserActionResult
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.lifecycle.ExclusiveActivatable
		import com.android.systemui.lifecycle.rememberViewModel
		import com.android.systemui.qs.panels.ui.compose.EditMode
		import com.android.systemui.qs.ui.viewmodel.EditModeSceneActionsViewModel
		import com.android.systemui.qs.ui.viewmodel.EditModeSceneContentViewModel
		import com.android.systemui.res.R
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.scene.ui.composable.Scene
		import com.android.systemui.shade.ui.composable.Shade
		import com.android.systemui.shade.ui.composable.ShadeHeader
		import javax.inject.Inject
		import kotlinx.coroutines.flow.Flow

		@SysUISingleton
		class EditModeScene
		@Inject
		constructor(
		private val contentViewModelFactory: EditModeSceneContentViewModel.Factory,
		private val actionsViewModelFactory: EditModeSceneActionsViewModel.Factory,
		) : ExclusiveActivatable(), Scene {
		override val key = Scenes.QSEditMode

		private val actionsViewModel: EditModeSceneActionsViewModel by lazy {
		actionsViewModelFactory.create()
		}

		override suspend fun onActivated() {
		actionsViewModel.activate()
		}

		override val userActions: Flow<Map<UserAction, UserActionResult>> = actionsViewModel.actions

		override val alwaysCompose: Boolean = false

		@Composable
		override fun ContentScope.Content(modifier: Modifier) {
		val viewModel =
		rememberViewModel("edit_mode_scene_view_model") { contentViewModelFactory.create() }

		Box(modifier = modifier.fillMaxSize()) {
		Box(
		modifier =
		Modifier.fillMaxSize()
		.element(Shade.Elements.BackgroundScrim)
		.background(colorResource(R.color.shade_scrim_background_dark))
		)

		EditMode(
		viewModel.editModeViewModel,
		Modifier.fillMaxSize()
		.testTag("edit_mode_scene")
		.padding(horizontal = QuickSettingsShade.Dimensions.Padding)
		.padding(top = ShadeHeader.Dimensions.StatusBarHeight),
		)
		}
		}
		}

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsPanelLayout.kt→packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsContent.kt

+131 −0

Original line number	Diff line number	Diff line
		@@ -20,12 +20,82 @@ import androidx.compose.foundation.layout.Arrangement.spacedBy
		import androidx.compose.foundation.layout.Box
		import androidx.compose.foundation.layout.Column
		import androidx.compose.foundation.layout.Row
		import androidx.compose.foundation.layout.padding
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.getValue
		import androidx.compose.runtime.mutableStateOf
		import androidx.compose.runtime.remember
		import androidx.compose.runtime.setValue
		import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.res.dimensionResource
		import androidx.lifecycle.compose.LifecycleStartEffect
		import com.android.compose.animation.scene.ContentScope
		import com.android.systemui.brightness.ui.compose.BrightnessSliderContainer
		import com.android.systemui.brightness.ui.compose.ContainerColors
		import com.android.systemui.compose.modifiers.sysuiResTag
		import com.android.systemui.media.remedia.ui.compose.Media
		import com.android.systemui.media.remedia.ui.compose.MediaPresentationStyle
		import com.android.systemui.qs.composefragment.ui.GridAnchor
		import com.android.systemui.qs.panels.ui.compose.TileGrid
		import com.android.systemui.qs.shared.ui.ElementKeys
		import com.android.systemui.qs.ui.viewmodel.QuickSettingsContainerViewModel
		import com.android.systemui.res.R

		@Composable
		fun QuickSettingsPanelLayout(
		fun ContentScope.QuickSettingsContent(
		viewModel: QuickSettingsContainerViewModel,
		mediaInRow: Boolean,
		) {
		QuickSettingsPanelLayout(
		brightness =
		@Composable {
		BrightnessSliderContainer(
		viewModel.brightnessSliderViewModel,
		containerColors =
		ContainerColors(Color.Transparent, ContainerColors.defaultContainerColor),
		modifier =
		Modifier.padding(
		vertical = dimensionResource(id = R.dimen.qs_brightness_margin_top)
		),
		)
		},
		tiles =
		@Composable {
		var listening by remember { mutableStateOf(false) }
		LifecycleStartEffect(Unit) {
		listening = true

		onStopOrDispose { listening = false }
		}

		Box {
		GridAnchor()
		TileGrid(viewModel.tileGridViewModel, listening = { listening })
		}
		},
		media =
		@Composable {
		Element(key = Media.Elements.mediaCarousel, modifier = Modifier) {
		Media(
		viewModelFactory = viewModel.mediaViewModelFactory,
		presentationStyle = MediaPresentationStyle.Default,
		behavior = QuickSettingsContainerViewModel.mediaUiBehavior,
		onDismissed = viewModel::onMediaSwipeToDismiss,
		)
		}
		},
		mediaInRow = mediaInRow,
		modifier =
		Modifier.element(ElementKeys.QuickSettingsContent)
		.padding(horizontal = dimensionResource(id = R.dimen.qs_horizontal_margin))
		.sysuiResTag("quick_settings_panel"),
		)
		}

		@Composable
		private fun QuickSettingsPanelLayout(
		brightness: @Composable () -> Unit,
		tiles: @Composable () -> Unit,
		media: @Composable () -> Unit,

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt

+122 −86

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.systemui.qs.ui.composable

		import androidx.compose.animation.core.animateFloatAsState
		import androidx.compose.animation.core.tween
		import androidx.compose.foundation.clipScrollableContainer
		import androidx.compose.foundation.gestures.Orientation
		import androidx.compose.foundation.layout.Box
		@@ -38,49 +39,47 @@ import androidx.compose.foundation.rememberScrollState
		import androidx.compose.foundation.verticalScroll
		import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.DisposableEffect
		import androidx.compose.runtime.getValue
		import androidx.compose.runtime.mutableStateOf
		import androidx.compose.runtime.remember
		import androidx.compose.runtime.setValue
		import androidx.compose.runtime.rememberCoroutineScope
		import androidx.compose.runtime.snapshotFlow
		import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.graphics.CompositingStrategy
		import androidx.compose.ui.graphics.graphicsLayer
		import androidx.compose.ui.platform.LocalConfiguration
		import androidx.compose.ui.platform.LocalDensity
		import androidx.compose.ui.platform.LocalLifecycleOwner
		import androidx.compose.ui.platform.testTag
		import androidx.compose.ui.res.dimensionResource
		import androidx.compose.ui.unit.IntOffset
		import androidx.compose.ui.unit.dp
		import androidx.lifecycle.compose.LifecycleStartEffect
		import androidx.lifecycle.compose.LocalLifecycleOwner
		import com.android.compose.animation.scene.ContentScope
		import com.android.compose.animation.scene.SceneKey
		import com.android.compose.animation.scene.UserAction
		import com.android.compose.animation.scene.UserActionResult
		import com.android.compose.animation.scene.animateContentFloatAsState
		import com.android.compose.animation.scene.content.state.TransitionState
		import com.android.compose.animation.scene.rememberMutableSceneTransitionLayoutState
		import com.android.compose.animation.scene.transitions
		import com.android.compose.lifecycle.DisposableEffectWithLifecycle
		import com.android.compose.lifecycle.LaunchedEffectWithLifecycle
		import com.android.compose.modifiers.thenIf
		import com.android.compose.windowsizeclass.LocalWindowSizeClass
		import com.android.internal.jank.InteractionJankMonitor
		import com.android.systemui.brightness.ui.compose.BrightnessSliderContainer
		import com.android.systemui.brightness.ui.compose.ContainerColors
		import com.android.systemui.common.ui.compose.windowinsets.CutoutLocation
		import com.android.systemui.common.ui.compose.windowinsets.LocalDisplayCutout
		import com.android.systemui.compose.modifiers.sysuiResTag
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.lifecycle.ExclusiveActivatable
		import com.android.systemui.lifecycle.rememberViewModel
		import com.android.systemui.media.remedia.ui.compose.Media
		import com.android.systemui.media.remedia.ui.compose.MediaPresentationStyle
		import com.android.systemui.notifications.ui.composable.HeadsUpNotificationSpace
		import com.android.systemui.notifications.ui.composable.NotificationScrollingStack
		import com.android.systemui.qs.composefragment.ui.GridAnchor
		import com.android.systemui.qs.footer.ui.compose.FooterActionsWithAnimatedVisibility
		import com.android.systemui.qs.panels.ui.compose.TileGrid
		import com.android.systemui.qs.shared.ui.ElementKeys
		import com.android.systemui.qs.ui.viewmodel.QuickSettingsContainerViewModel
		import com.android.systemui.qs.panels.ui.compose.EditMode
		import com.android.systemui.qs.ui.composable.QuickSettingsScene.Companion.InternalScenes.Edit
		import com.android.systemui.qs.ui.composable.QuickSettingsScene.Companion.InternalScenes.QS
		import com.android.systemui.qs.ui.viewmodel.QuickSettingsSceneContentViewModel
		import com.android.systemui.qs.ui.viewmodel.QuickSettingsUserActionsViewModel
		import com.android.systemui.res.R
		@@ -89,6 +88,7 @@ import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.scene.ui.composable.Scene
		import com.android.systemui.shade.ui.composable.CollapsedShadeHeader
		import com.android.systemui.shade.ui.composable.ExpandedShadeHeader
		import com.android.systemui.shade.ui.composable.ShadeHeader
		import com.android.systemui.shade.ui.composable.ShadePanelScrim
		import com.android.systemui.shade.ui.viewmodel.ShadeHeaderViewModel
		import com.android.systemui.statusbar.notification.stack.ui.view.NotificationScrollView
		@@ -132,16 +132,51 @@ constructor(
		rememberViewModel("QuickSettingsScene-notifPlaceholderViewModel") {
		notificationsPlaceholderViewModelFactory.create()
		}

		val brightnessMirrorShowing =
		viewModel.qsContainerViewModel.brightnessSliderViewModel.showMirror
		val contentAlpha by
		animateFloatAsState(
		targetValue = if (brightnessMirrorShowing) 0f else 1f,
		label = "alphaAnimationBrightnessMirrorContentHiding",
		)

		LaunchedEffectWithLifecycle(key1 = Unit) {
		try {
		snapshotFlow { contentAlpha }
		.collect { notificationsPlaceholderViewModel.setAlphaForBrightnessMirror(it) }
		} finally {
		notificationsPlaceholderViewModel.setAlphaForBrightnessMirror(1f)
		}
		}

		QuickSettingsScene(
		notificationStackScrollView = notificationStackScrollView.get(),
		viewModel = viewModel,
		headerViewModel = viewModel.qsContainerViewModel.shadeHeaderViewModel,
		notificationsPlaceholderViewModel = notificationsPlaceholderViewModel,
		modifier = modifier,
		modifier = modifier.graphicsLayer { alpha = contentAlpha },
		shadeSession = shadeSession,
		jankMonitor = jankMonitor,
		)
		}

		companion object {
		object InternalScenes {
		val QS = SceneKey("QuickSettingsMainPanel")
		val Edit = SceneKey("QuickSettingsEditPanel")

		private const val EDIT_MODE_TIME_MILLIS = 500

		val transitions = transitions {
		from(QS, Edit) {
		spec = tween(durationMillis = EDIT_MODE_TIME_MILLIS)
		fractionRange(start = 0.5f) { fade(Edit.rootElementKey) }
		fractionRange(end = 0.5f) { fade(QS.rootElementKey) }
		}
		}
		}
		}
		}

		@Composable
		@@ -154,19 +189,80 @@ private fun ContentScope.QuickSettingsScene(
		shadeSession: SaveableSession,
		jankMonitor: InteractionJankMonitor,
		) {
		val cutoutLocation = LocalDisplayCutout.current().location
		val brightnessMirrorShowing =
		viewModel.qsContainerViewModel.brightnessSliderViewModel.showMirror
		val contentAlpha by
		animateFloatAsState(
		targetValue = if (brightnessMirrorShowing) 0f else 1f,
		label = "alphaAnimationBrightnessMirrorContentHiding",
		Box(modifier.fillMaxSize()) {
		// This is the background for the whole scene, as the elements don't necessarily provide
		// a background that extends to the edges.
		ShadePanelScrim(viewModel.isTransparencyEnabled)

		val sceneState =
		rememberMutableSceneTransitionLayoutState(
		initialScene =
		remember { if (viewModel.qsContainerViewModel.isEditing) Edit else QS },
		transitions = QuickSettingsScene.Companion.InternalScenes.transitions,
		)

		val coroutineScope = rememberCoroutineScope()

		DisposableEffectWithLifecycle(key1 = viewModel, key2 = sceneState) {
		onDispose {
		viewModel.qsContainerViewModel.editModeViewModel.stopEditing()
		sceneState.snapTo(QS)
		}
		}

		LaunchedEffectWithLifecycle(
		key1 = sceneState,
		key2 = viewModel.qsContainerViewModel.isEditing,
		key3 = coroutineScope,
		) {
		if (viewModel.qsContainerViewModel.isEditing) {
		sceneState.setTargetScene(Edit, coroutineScope)
		} else {
		sceneState.setTargetScene(QS, coroutineScope)
		}
		}

		NestedSceneTransitionLayout(state = sceneState, modifier = Modifier.fillMaxSize()) {
		scene(QS) {
		Element(QS.rootElementKey, Modifier) {
		QuickSettingsContent(
		notificationsPlaceholderViewModel,
		Modifier,
		viewModel,
		headerViewModel,
		notificationStackScrollView,
		shadeSession,
		jankMonitor,
		)
		}
		}

		notificationsPlaceholderViewModel.setAlphaForBrightnessMirror(contentAlpha)
		DisposableEffect(Unit) {
		onDispose { notificationsPlaceholderViewModel.setAlphaForBrightnessMirror(1f) }
		scene(Edit) {
		Element(Edit.rootElementKey, Modifier) {
		GridAnchor()
		EditMode(
		viewModel.qsContainerViewModel.editModeViewModel,
		Modifier.testTag("edit_mode_scene")
		.padding(horizontal = QuickSettingsShade.Dimensions.Padding)
		.padding(top = ShadeHeader.Dimensions.StatusBarHeight),
		)
		}
		}
		}
		}
		}

		@Composable
		private fun ContentScope.QuickSettingsContent(
		notificationsPlaceholderViewModel: NotificationsPlaceholderViewModel,
		modifier: Modifier,
		viewModel: QuickSettingsSceneContentViewModel,
		headerViewModel: ShadeHeaderViewModel,
		notificationStackScrollView: NotificationScrollView,
		shadeSession: SaveableSession,
		jankMonitor: InteractionJankMonitor,
		) {
		val cutoutLocation = LocalDisplayCutout.current().location

		val shadeHorizontalPadding =
		dimensionResource(id = R.dimen.notification_panel_margin_horizontal)
		@@ -180,7 +276,6 @@ private fun ContentScope.QuickSettingsScene(
		modifier =
		modifier
		.fillMaxSize()
		.graphicsLayer { alpha = contentAlpha }
		.thenIf(shouldPunchHoleBehindScrim) {
		// Render the scene to an offscreen buffer so that BlendMode.DstOut only clears
		// this scene (and not the one under it) during a scene transition.
		@@ -223,7 +318,6 @@ private fun ContentScope.QuickSettingsScene(
		// ############# Media ###############
		val mediaInRow = viewModel.qsContainerViewModel.showMediaInRow

		ShadePanelScrim(viewModel.isTransparencyEnabled)
		Column(
		horizontalAlignment = Alignment.CenterHorizontally,
		modifier =
		@@ -251,65 +345,7 @@ private fun ContentScope.QuickSettingsScene(
		CollapsedShadeHeader(viewModel = headerViewModel, isSplitShade = false)
		}
		Spacer(modifier = Modifier.height(16.dp))

		var listening by remember { mutableStateOf(false) }
		LifecycleStartEffect(Unit) {
		listening = true

		onStopOrDispose { listening = false }
		}

		QuickSettingsPanelLayout(
		brightness =
		@Composable {
		BrightnessSliderContainer(
		viewModel.qsContainerViewModel.brightnessSliderViewModel,
		containerColors =
		ContainerColors(
		Color.Transparent,
		ContainerColors.defaultContainerColor,
		),
		modifier =
		Modifier.padding(
		vertical =
		dimensionResource(
		id = R.dimen.qs_brightness_margin_top
		)
		),
		)
		},
		tiles =
		@Composable {
		Box {
		GridAnchor()
		TileGrid(
		viewModel.qsContainerViewModel.tileGridViewModel,
		listening = { listening },
		)
		}
		},
		media =
		@Composable {
		Element(key = Media.Elements.mediaCarousel, modifier = Modifier) {
		Media(
		viewModelFactory =
		viewModel.qsContainerViewModel.mediaViewModelFactory,
		presentationStyle = MediaPresentationStyle.Default,
		behavior = QuickSettingsContainerViewModel.mediaUiBehavior,
		onDismissed =
		viewModel.qsContainerViewModel::onMediaSwipeToDismiss,
		)
		}
		},
		mediaInRow = mediaInRow,
		modifier =
		Modifier.element(ElementKeys.QuickSettingsContent)
		.padding(
		horizontal =
		dimensionResource(id = R.dimen.qs_horizontal_margin)
		)
		.sysuiResTag("quick_settings_panel"),
		)
		QuickSettingsContent(viewModel.qsContainerViewModel, mediaInRow)
		}
		}

packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToQuickSettingsTransition.kt

+8 −0

Original line number	Diff line number	Diff line
		@@ -20,7 +20,9 @@ import androidx.compose.animation.core.tween
		import com.android.compose.animation.scene.Edge
		import com.android.compose.animation.scene.TransitionBuilder
		import com.android.systemui.notifications.ui.composable.Notifications
		import com.android.systemui.qs.shared.ui.ElementKeys
		import com.android.systemui.qs.ui.composable.QuickSettings
		import com.android.systemui.qs.ui.composable.QuickSettingsScene
		import com.android.systemui.shade.ui.composable.ShadeHeader
		import kotlin.time.Duration.Companion.milliseconds

		@@ -41,8 +43,14 @@ fun TransitionBuilder.toQuickSettingsTransition(durationScale: Double = 1.0) {
		fade(ShadeHeader.Elements.ShadeCarrierGroup)
		}

		fade(Notifications.Elements.HeadsUpNotificationPlaceholder)

		// Old QSSceneAdapter element
		translate(QuickSettings.Elements.Content, y = -ShadeHeader.Dimensions.ExpandedHeight * .66f)
		// New all compose element
		translate(ElementKeys.QuickSettingsContent, y = -ShadeHeader.Dimensions.ExpandedHeight * .66f)
		translate(Notifications.Elements.NotificationScrim, Edge.Top, false)
		translate(QuickSettingsScene.Companion.InternalScenes.Edit.rootElementKey, Edge.Top, true)
		}

		private val DefaultDuration = 500.milliseconds