Loading packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainer.kt +9 −13 Original line number Diff line number Diff line Loading @@ -18,7 +18,6 @@ package com.android.systemui.scene.ui.composable import android.os.SystemProperties import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.Text Loading Loading @@ -84,7 +83,6 @@ fun SceneContainer( val currentDestinations: Map<UserAction, SceneModel> by currentScene.destinationScenes.collectAsState() val state = remember { SceneTransitionLayoutState(currentSceneKey.toTransitionSceneKey()) } val isRibbonEnabled = remember { SystemProperties.getBoolean("flexi.ribbon", false) } DisposableEffect(viewModel, state) { viewModel.setTransitionState(state.observableTransitionState().map { it.toModel() }) Loading Loading @@ -137,7 +135,6 @@ fun SceneContainer( } } if (isRibbonEnabled) { BottomRightCornerRibbon( content = { Text( Loading @@ -149,7 +146,6 @@ fun SceneContainer( ) } } } // TODO(b/293899074): remove this once we can use the one from SceneTransitionLayout. private fun SceneTransitionObservableTransitionState.toModel(): ObservableTransitionState { Loading Loading
packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainer.kt +9 −13 Original line number Diff line number Diff line Loading @@ -18,7 +18,6 @@ package com.android.systemui.scene.ui.composable import android.os.SystemProperties import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.Text Loading Loading @@ -84,7 +83,6 @@ fun SceneContainer( val currentDestinations: Map<UserAction, SceneModel> by currentScene.destinationScenes.collectAsState() val state = remember { SceneTransitionLayoutState(currentSceneKey.toTransitionSceneKey()) } val isRibbonEnabled = remember { SystemProperties.getBoolean("flexi.ribbon", false) } DisposableEffect(viewModel, state) { viewModel.setTransitionState(state.observableTransitionState().map { it.toModel() }) Loading Loading @@ -137,7 +135,6 @@ fun SceneContainer( } } if (isRibbonEnabled) { BottomRightCornerRibbon( content = { Text( Loading @@ -149,7 +146,6 @@ fun SceneContainer( ) } } } // TODO(b/293899074): remove this once we can use the one from SceneTransitionLayout. private fun SceneTransitionObservableTransitionState.toModel(): ObservableTransitionState { Loading