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

Commit def8d4fc authored by Anton Potapov's avatar Anton Potapov
Browse files

Use MovableElementScenePicker logic in MediaScenePicker as a fallback. 

Flag: com.android.systemui.scene_container
Bug: 340216785
Test: manual on the foldable
Change-Id: I31d90bf475f84b12fdc8281b99494d29729db3e9
parent 40477f9b

packages/SystemUI/compose/features/src/com/android/systemui/media/controls/ui/composable/MediaScenePicker.kt

+7 −5
Original line number Diff line number Diff line
@@ -49,14 +49,16 @@ object MediaScenePicker : ElementScenePicker { 
            transition.isTransitioningBetween(Scenes.Lockscreen, Scenes.Communal) -> {

                Scenes.Lockscreen

            }



            // TODO: 345467290 - update with the actual scene picking

            transition.isTransitioningBetween(Scenes.QuickSettings, Scenes.Shade) -> {

                Scenes.QuickSettings

            }



            // TODO: 340216785 - update with the actual scene picking

            else -> pickSingleSceneIn(scenes, transition, element)

            else -> {

                when {

                    scenes.contains(transition.toScene) -> transition.toScene

                    scenes.contains(transition.fromScene) -> transition.fromScene

                    else -> null

                }

            }

        }

    }