Merge "[bc25] Remove the deprecated shade scenes from SceneContainer." into main (5760baad) · Commits · e / os / android_frameworks_base

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

+2 −21

Original line number	Diff line number	Diff line
		@@ -11,21 +11,16 @@ import com.android.systemui.scene.shared.model.TransitionKeys.SlightlyFasterShad
		import com.android.systemui.scene.shared.model.TransitionKeys.ToSplitShade
		import com.android.systemui.scene.ui.composable.transitions.bouncerToGoneTransition
		import com.android.systemui.scene.ui.composable.transitions.bouncerToLockscreenPreview
		import com.android.systemui.scene.ui.composable.transitions.goneToNotificationsShadeTransition
		import com.android.systemui.scene.ui.composable.transitions.goneToQuickSettingsShadeTransition
		import com.android.systemui.scene.ui.composable.transitions.goneToQuickSettingsTransition
		import com.android.systemui.scene.ui.composable.transitions.goneToShadeTransition
		import com.android.systemui.scene.ui.composable.transitions.goneToSplitShadeTransition
		import com.android.systemui.scene.ui.composable.transitions.lockscreenToBouncerTransition
		import com.android.systemui.scene.ui.composable.transitions.lockscreenToCommunalTransition
		import com.android.systemui.scene.ui.composable.transitions.lockscreenToGoneTransition
		import com.android.systemui.scene.ui.composable.transitions.lockscreenToNotificationsShadeTransition
		import com.android.systemui.scene.ui.composable.transitions.lockscreenToQuickSettingsShadeTransition
		import com.android.systemui.scene.ui.composable.transitions.lockscreenToQuickSettingsTransition
		import com.android.systemui.scene.ui.composable.transitions.lockscreenToShadeTransition
		import com.android.systemui.scene.ui.composable.transitions.lockscreenToSplitShadeTransition
		import com.android.systemui.scene.ui.composable.transitions.shadeToQuickSettingsTransition
		import com.android.systemui.shade.ui.composable.OverlayShade
		import com.android.systemui.shade.ui.composable.Shade

		/**
		@@ -48,8 +43,6 @@ val SceneContainerTransitions = transitions {
		// Scene transitions

		from(Scenes.Bouncer, to = Scenes.Gone) { bouncerToGoneTransition() }
		from(Scenes.Gone, to = Scenes.NotificationsShade) { goneToNotificationsShadeTransition() }
		from(Scenes.Gone, to = Scenes.QuickSettingsShade) { goneToQuickSettingsShadeTransition() }
		from(Scenes.Gone, to = Scenes.Shade) { goneToShadeTransition() }
		from(Scenes.Gone, to = Scenes.Shade, key = ToSplitShade) { goneToSplitShadeTransition() }
		from(Scenes.Gone, to = Scenes.Shade, key = SlightlyFasterShadeCollapse) {
		@@ -65,17 +58,11 @@ val SceneContainerTransitions = transitions {
		Scenes.Lockscreen,
		to = Scenes.Bouncer,
		key = TransitionKey.PredictiveBack,
		reversePreview = { bouncerToLockscreenPreview() }
		reversePreview = { bouncerToLockscreenPreview() },
		) {
		lockscreenToBouncerTransition()
		}
		from(Scenes.Lockscreen, to = Scenes.Communal) { lockscreenToCommunalTransition() }
		from(Scenes.Lockscreen, to = Scenes.NotificationsShade) {
		lockscreenToNotificationsShadeTransition()
		}
		from(Scenes.Lockscreen, to = Scenes.QuickSettingsShade) {
		lockscreenToQuickSettingsShadeTransition()
		}
		from(Scenes.Lockscreen, to = Scenes.Shade) { lockscreenToShadeTransition() }
		from(Scenes.Lockscreen, to = Scenes.Shade, key = ToSplitShade) {
		lockscreenToSplitShadeTransition()
		@@ -96,7 +83,7 @@ val SceneContainerTransitions = transitions {
		overscroll(Scenes.Shade, Orientation.Vertical) {
		translate(
		Notifications.Elements.NotificationScrim,
		y = Shade.Dimensions.ScrimOverscrollLimit
		y = Shade.Dimensions.ScrimOverscrollLimit,
		)
		translate(Shade.Elements.SplitShadeStartColumn, y = Shade.Dimensions.ScrimOverscrollLimit)
		translate(
		@@ -104,10 +91,4 @@ val SceneContainerTransitions = transitions {
		y = Shade.Dimensions.ScrimOverscrollLimit,
		)
		}
		overscroll(Scenes.NotificationsShade, Orientation.Vertical) {
		translate(OverlayShade.Elements.Panel, y = OverlayShade.Dimensions.OverscrollLimit)
		}
		overscroll(Scenes.QuickSettingsShade, Orientation.Vertical) {
		translate(OverlayShade.Elements.Panel, y = OverlayShade.Dimensions.OverscrollLimit)
		}
		}

packages/SystemUI/src/com/android/systemui/model/SceneContainerPlugin.kt

+3 −10

Original line number	Diff line number	Diff line
		@@ -88,15 +88,11 @@ constructor(
		when {
		it.invisibleDueToOcclusion -> false
		it.scene == Scenes.Lockscreen -> true
		it.scene == Scenes.NotificationsShade -> true
		it.scene == Scenes.Shade -> true
		else -> false
		}
		},
		SYSUI_STATE_QUICK_SETTINGS_EXPANDED to
		{
		it.scene == Scenes.QuickSettingsShade \|\| it.scene == Scenes.QuickSettings
		},
		SYSUI_STATE_QUICK_SETTINGS_EXPANDED to { it.scene == Scenes.QuickSettings },
		SYSUI_STATE_BOUNCER_SHOWING to { it.scene == Scenes.Bouncer },
		SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING to
		{
		@@ -106,12 +102,9 @@ constructor(
		{
		it.scene == Scenes.Lockscreen && it.invisibleDueToOcclusion
		},
		SYSUI_STATE_COMMUNAL_HUB_SHOWING to { it.scene == Scenes.Communal }
		SYSUI_STATE_COMMUNAL_HUB_SHOWING to { it.scene == Scenes.Communal },
		)
		}

		data class SceneContainerPluginState(
		val scene: SceneKey,
		val invisibleDueToOcclusion: Boolean,
		)
		data class SceneContainerPluginState(val scene: SceneKey, val invisibleDueToOcclusion: Boolean)
		}

packages/SystemUI/src/com/android/systemui/scene/KeyguardlessSceneContainerFrameworkModule.kt

+3 −7

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ import dagger.multibindings.IntoMap
		HomeSceneFamilyResolverModule::class,
		NotifShadeSceneFamilyResolverModule::class,
		QuickSettingsSceneFamilyResolverModule::class,
		],
		]
		)
		interface KeyguardlessSceneContainerFrameworkModule {

		@@ -100,8 +100,6 @@ interface KeyguardlessSceneContainerFrameworkModule {
		listOfNotNull(
		Scenes.Gone,
		Scenes.QuickSettings.takeUnless { DualShade.isEnabled },
		Scenes.QuickSettingsShade.takeIf { DualShade.isEnabled },
		Scenes.NotificationsShade.takeIf { DualShade.isEnabled },
		Scenes.Shade.takeUnless { DualShade.isEnabled },
		),
		initialSceneKey = Scenes.Gone,
		@@ -113,13 +111,11 @@ interface KeyguardlessSceneContainerFrameworkModule {
		navigationDistances =
		mapOf(
		Scenes.Gone to 0,
		Scenes.NotificationsShade to 1.takeIf { DualShade.isEnabled },
		Scenes.Shade to 1.takeUnless { DualShade.isEnabled },
		Scenes.QuickSettingsShade to 2.takeIf { DualShade.isEnabled },
		Scenes.QuickSettings to 2.takeUnless { DualShade.isEnabled },
		)
		.filterValues { it != null }
		.mapValues { checkNotNull(it.value) }
		.mapValues { checkNotNull(it.value) },
		)
		}

		@@ -129,7 +125,7 @@ interface KeyguardlessSceneContainerFrameworkModule {
		topEdgeSplitFraction = shadeInteractor::getTopEdgeSplitFraction,
		// TODO(b/338577208): This should be 60dp at the top in the dual-shade UI. Better to
		// replace this constant with dynamic window insets.
		edgeSize = 40.dp
		edgeSize = 40.dp,
		)
		}
		}

packages/SystemUI/src/com/android/systemui/scene/SceneContainerFrameworkModule.kt

+3 −7

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ import dagger.multibindings.IntoMap
		HomeSceneFamilyResolverModule::class,
		NotifShadeSceneFamilyResolverModule::class,
		QuickSettingsSceneFamilyResolverModule::class,
		],
		]
		)
		interface SceneContainerFrameworkModule {

		@@ -107,8 +107,6 @@ interface SceneContainerFrameworkModule {
		Scenes.Lockscreen,
		Scenes.Bouncer,
		Scenes.QuickSettings.takeUnless { DualShade.isEnabled },
		Scenes.QuickSettingsShade.takeIf { DualShade.isEnabled },
		Scenes.NotificationsShade.takeIf { DualShade.isEnabled },
		Scenes.Shade.takeUnless { DualShade.isEnabled },
		),
		initialSceneKey = Scenes.Lockscreen,
		@@ -122,14 +120,12 @@ interface SceneContainerFrameworkModule {
		Scenes.Gone to 0,
		Scenes.Lockscreen to 0,
		Scenes.Communal to 1,
		Scenes.NotificationsShade to 2.takeIf { DualShade.isEnabled },
		Scenes.Shade to 2.takeUnless { DualShade.isEnabled },
		Scenes.QuickSettingsShade to 3.takeIf { DualShade.isEnabled },
		Scenes.QuickSettings to 3.takeUnless { DualShade.isEnabled },
		Scenes.Bouncer to 4,
		)
		.filterValues { it != null }
		.mapValues { checkNotNull(it.value) }
		.mapValues { checkNotNull(it.value) },
		)
		}

		@@ -139,7 +135,7 @@ interface SceneContainerFrameworkModule {
		topEdgeSplitFraction = shadeInteractor::getTopEdgeSplitFraction,
		// TODO(b/338577208): This should be 60dp at the top in the dual-shade UI. Better to
		// replace this constant with dynamic window insets.
		edgeSize = 40.dp
		edgeSize = 40.dp,
		)
		}
		}

packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneContainerOcclusionInteractor.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -137,9 +137,7 @@ constructor(
		Scenes.Communal -> true
		Scenes.Gone -> true
		Scenes.Lockscreen -> true
		Scenes.NotificationsShade -> false
		Scenes.QuickSettings -> false
		Scenes.QuickSettingsShade -> false
		Scenes.Shade -> false
		else -> error("SceneKey \"$this\" doesn't have a mapping for canBeOccluded!")
		}