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

Commit 8c3df00e authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

[flexiglass] Ribbon is always on in Flexi. 

There are too many cases where the ribbon fails to show up; this removes
the conditionality and just always shows the ribbon when Flexiglass is
on. When the time comes, we can remove it.

Bug: 299340392
Test: manually verified that the ribbon is always on when flexiglass is
on
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT

Change-Id: If970d9050d06e31eaca89baa4f8b56e1a097a97c
parent 57f6fdf2

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

+9 −13
Original line number Diff line number Diff line
@@ -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
@@ -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() })
@@ -137,7 +135,6 @@ fun SceneContainer( 
            }

        }



        if (isRibbonEnabled) {

        BottomRightCornerRibbon(

            content = {

                Text(
@@ -149,7 +146,6 @@ fun SceneContainer( 
        )

    }

}

}



// TODO(b/293899074): remove this once we can use the one from SceneTransitionLayout.

private fun SceneTransitionObservableTransitionState.toModel(): ObservableTransitionState {