Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69642556 authored by burakov's avatar burakov Committed by Danny Burakov
Browse files

[Dual Shade] Include all shade ContentKeys in SceneContainer config. 

Now that ShadeMode.Dual is determined dynamically at runtime, we should
include both the shade OverlaysKeys as well as single/split shade
SceneKeys in the SceneContainer config.

Bug: 388793191
Test: Unit tests still pass.
Flag: com.android.systemui.scene_container
Change-Id: I07f1012f2164a80f2719f32e016f82bd2304160b
parent 3643213d

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

+5 −21
Original line number Diff line number Diff line
@@ -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),

            )

        }

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

+6 −11
Original line number Diff line number Diff line
@@ -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 },

            )

        }