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

Commit b0355317 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Avoid recomposing the QS scene every frame 

This CL leverages derivedStateOf so that we don't recompose the QS scene
every time the current transition progress has changed. This should
improve the performance of any transition to the Shade or QS scenes.

Bug: 372412931
Test: Performed transitions to Shade and QS scene with Flexiglass on
 and recomposition counts shown in Studio.
Flag: com.android.systemui.scene_container
Change-Id: I0e321ab607214fe62fda5190f64773ef4210d8e9
parent 19719a16

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt

+15 −6
Original line number Diff line number Diff line
@@ -24,7 +24,9 @@ import androidx.compose.foundation.layout.fillMaxWidth 
import androidx.compose.runtime.Composable

import androidx.compose.runtime.DisposableEffect

import androidx.compose.runtime.LaunchedEffect

import androidx.compose.runtime.derivedStateOf

import androidx.compose.runtime.getValue

import androidx.compose.runtime.remember

import androidx.compose.ui.Modifier

import androidx.compose.ui.draw.drawWithContent

import androidx.compose.ui.layout.layout
@@ -38,6 +40,7 @@ import com.android.compose.animation.scene.ElementKey 
import com.android.compose.animation.scene.MovableElementContentPicker

import com.android.compose.animation.scene.MovableElementKey

import com.android.compose.animation.scene.SceneScope

import com.android.compose.animation.scene.SceneTransitionLayoutState

import com.android.compose.animation.scene.ValueKey

import com.android.compose.animation.scene.content.state.TransitionState

import com.android.compose.modifiers.thenIf
@@ -158,12 +161,10 @@ fun SceneScope.QuickSettings( 
    squishiness: () -> Float = { QuickSettings.SharedValues.SquishinessValues.Default },

) {

    val contentState = { stateForQuickSettingsContent(isSplitShade, squishiness) }

    val transitionState = layoutState.transitionState

    val isClosing =

        transitionState is TransitionState.Transition &&

            transitionState.progress >= 0.9f && // almost done closing

            !(layoutState.isTransitioning(to = Scenes.Shade) ||

                layoutState.isTransitioning(to = Scenes.QuickSettings))



    // Note: We use derivedStateOf {} here because isClosing() is reading the current transition

    // progress and we don't want to recompose this scene each time the progress has changed.

    val isClosing by remember(layoutState) { derivedStateOf { isClosing(layoutState) } }



    if (isClosing) {

        DisposableEffect(Unit) {
@@ -188,6 +189,14 @@ fun SceneScope.QuickSettings( 
    }

}



private fun isClosing(layoutState: SceneTransitionLayoutState): Boolean {

    val transitionState = layoutState.transitionState

    return transitionState is TransitionState.Transition &&

        !(layoutState.isTransitioning(to = Scenes.Shade) ||

            layoutState.isTransitioning(to = Scenes.QuickSettings)) &&

        transitionState.progress >= 0.9f // almost done closing

}



@Composable

private fun QuickSettingsContent(

    qsSceneAdapter: QSSceneAdapter,