diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/scene/KeyguardlessSceneContainerFrameworkModule.kt | 26 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/scene/SceneContainerFrameworkModule.kt | 17 |
2 files changed, 11 insertions, 32 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/scene/KeyguardlessSceneContainerFrameworkModule.kt b/packages/SystemUI/src/com/android/systemui/scene/KeyguardlessSceneContainerFrameworkModule.kt index e36e40d312b5..3604c4cc4cfd 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/KeyguardlessSceneContainerFrameworkModule.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/KeyguardlessSceneContainerFrameworkModule.kt @@ -32,7 +32,6 @@ import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.scene.ui.composable.SceneContainerTransitions import com.android.systemui.scene.ui.viewmodel.SplitEdgeDetector import com.android.systemui.shade.domain.interactor.ShadeInteractor -import com.android.systemui.shade.shared.flag.DualShade import dagger.Binds import dagger.Module import dagger.Provides @@ -90,29 +89,14 @@ interface KeyguardlessSceneContainerFrameworkModule { @Provides fun containerConfig(): SceneContainerConfig { return SceneContainerConfig( - // Note that this list is in z-order. The first one is the bottom-most and the - // last one is top-most. - sceneKeys = - listOfNotNull( - Scenes.Gone, - Scenes.QuickSettings.takeUnless { DualShade.isEnabled }, - Scenes.Shade.takeUnless { DualShade.isEnabled }, - ), + // Note that this list is in z-order. The first one is the bottom-most and the last + // one is top-most. + sceneKeys = listOf(Scenes.Gone, Scenes.QuickSettings, Scenes.Shade), initialSceneKey = Scenes.Gone, transitions = SceneContainerTransitions, - overlayKeys = - listOfNotNull( - Overlays.NotificationsShade.takeIf { DualShade.isEnabled }, - Overlays.QuickSettingsShade.takeIf { DualShade.isEnabled }, - ), + overlayKeys = listOf(Overlays.NotificationsShade, Overlays.QuickSettingsShade), navigationDistances = - mapOf( - Scenes.Gone to 0, - Scenes.Shade to 1.takeUnless { DualShade.isEnabled }, - Scenes.QuickSettings to 2.takeUnless { DualShade.isEnabled }, - ) - .filterValues { it != null } - .mapValues { checkNotNull(it.value) }, + mapOf(Scenes.Gone to 0, Scenes.Shade to 1, Scenes.QuickSettings to 2), ) } diff --git a/packages/SystemUI/src/com/android/systemui/scene/SceneContainerFrameworkModule.kt b/packages/SystemUI/src/com/android/systemui/scene/SceneContainerFrameworkModule.kt index fe014524e3da..91677b03d589 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/SceneContainerFrameworkModule.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/SceneContainerFrameworkModule.kt @@ -32,7 +32,6 @@ import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.scene.ui.composable.SceneContainerTransitions import com.android.systemui.scene.ui.viewmodel.SplitEdgeDetector import com.android.systemui.shade.domain.interactor.ShadeInteractor -import com.android.systemui.shade.shared.flag.DualShade import dagger.Binds import dagger.Module import dagger.Provides @@ -103,28 +102,24 @@ interface SceneContainerFrameworkModule { Scenes.Dream, Scenes.Lockscreen, Scenes.Bouncer, - Scenes.QuickSettings.takeUnless { DualShade.isEnabled }, - Scenes.Shade.takeUnless { DualShade.isEnabled }, + Scenes.QuickSettings, + Scenes.Shade, ), initialSceneKey = Scenes.Lockscreen, transitions = SceneContainerTransitions, overlayKeys = - listOfNotNull( - Overlays.NotificationsShade.takeIf { DualShade.isEnabled }, - Overlays.QuickSettingsShade.takeIf { DualShade.isEnabled }, - ), + listOfNotNull(Overlays.NotificationsShade, Overlays.QuickSettingsShade), navigationDistances = mapOf( Scenes.Gone to 0, Scenes.Lockscreen to 0, Scenes.Communal to 1, Scenes.Dream to 2, - Scenes.Shade to 3.takeUnless { DualShade.isEnabled }, - Scenes.QuickSettings to 4.takeUnless { DualShade.isEnabled }, + Scenes.Shade to 3, + Scenes.QuickSettings to 4, Scenes.Bouncer to 5, ) - .filterValues { it != null } - .mapValues { checkNotNull(it.value) }, + .mapValues { it.value }, ) } |