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

Commit 2d2f374b authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Remove the fork of STL SceneKey 

Bug: 293899074
Test: m sysuig
Test: m SystemUITests
Test: Manual, enabled Flexiglass and used it.
Flag: N/A
Change-Id: I82841caf17e8e47ed4d61145aedb73f2356d05cd
parent 7ed3c2d9

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.keyguard.ui.composable 
import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import com.android.compose.animation.scene.SceneKey

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

import com.android.compose.animation.scene.animateSceneFloatAsState

import com.android.systemui.dagger.SysUISingleton
@@ -27,7 +28,6 @@ import com.android.systemui.keyguard.ui.viewmodel.LockscreenSceneViewModel 
import com.android.systemui.qs.ui.composable.QuickSettings

import com.android.systemui.scene.shared.model.Direction

import com.android.systemui.scene.shared.model.Edge

import com.android.systemui.scene.shared.model.SceneKey

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.shared.model.UserAction

import com.android.systemui.scene.shared.model.UserActionResult

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt

+4 −5
Original line number Diff line number Diff line
@@ -71,8 +71,7 @@ import com.android.systemui.common.ui.compose.windowinsets.LocalScreenCornerRadi 
import com.android.systemui.notifications.ui.composable.Notifications.Form

import com.android.systemui.notifications.ui.composable.Notifications.TransitionThresholds.EXPANSION_FOR_MAX_CORNER_RADIUS

import com.android.systemui.notifications.ui.composable.Notifications.TransitionThresholds.EXPANSION_FOR_MAX_SCRIM_ALPHA

import com.android.systemui.scene.ui.composable.Gone

import com.android.systemui.scene.ui.composable.Shade

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.shade.ui.composable.ShadeHeader

import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackAppearanceViewBinder.SCRIM_CORNER_RADIUS

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel
@@ -214,7 +213,7 @@ fun SceneScope.NotificationScrollingStack( 
                    // in step with the transition so that it is 0 when it completes.

                    if (

                        scrimOffset.value < 0 &&

                            layoutState.isTransitioning(from = Shade, to = Gone)

                            layoutState.isTransitioning(from = Scenes.Shade, to = Scenes.Gone)

                    ) {

                        IntOffset(x = 0, y = (scrimOffset.value * expansionFraction).roundToInt())

                    } else {
@@ -226,7 +225,7 @@ fun SceneScope.NotificationScrollingStack( 
                        calculateCornerRadius(

                                screenCornerRadius,

                                { expansionFraction },

                                layoutState.isTransitioningBetween(Gone, Shade)

                                layoutState.isTransitioningBetween(Scenes.Gone, Scenes.Shade)

                            )

                            .let {

                                RoundedCornerShape(
@@ -250,7 +249,7 @@ fun SceneScope.NotificationScrollingStack( 
                Modifier.fillMaxSize()

                    .graphicsLayer {

                        alpha =

                            if (layoutState.isTransitioningBetween(Gone, Shade)) {

                            if (layoutState.isTransitioningBetween(Scenes.Gone, Scenes.Shade)) {

                                (expansionFraction / EXPANSION_FOR_MAX_SCRIM_ALPHA).coerceAtMost(1f)

                            } else 1f

                    }

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

+11 −10
Original line number Diff line number Diff line
@@ -37,14 +37,13 @@ import com.android.systemui.qs.ui.adapter.QSSceneAdapter 
import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.Companion.Collapsing

import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.Expanding

import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.Unsquishing

import com.android.systemui.scene.ui.composable.QuickSettings as QuickSettingsSceneKey

import com.android.systemui.scene.ui.composable.Shade

import com.android.systemui.scene.shared.model.Scenes



object QuickSettings {

    private val SCENES =

        setOf(

            QuickSettingsSceneKey,

            Shade,

            Scenes.QuickSettings,

            Scenes.Shade,

        )



    object Elements {
@@ -69,18 +68,20 @@ private fun SceneScope.stateForQuickSettingsContent( 
    return when (val transitionState = layoutState.transitionState) {

        is TransitionState.Idle -> {

            when (transitionState.currentScene) {

                Shade -> QSSceneAdapter.State.QQS

                QuickSettingsSceneKey -> QSSceneAdapter.State.QS

                Scenes.Shade -> QSSceneAdapter.State.QQS

                Scenes.QuickSettings -> QSSceneAdapter.State.QS

                else -> QSSceneAdapter.State.CLOSED

            }

        }

        is TransitionState.Transition ->

            with(transitionState) {

                when {

                    fromScene == Shade && toScene == QuickSettingsSceneKey -> Expanding(progress)

                    fromScene == QuickSettingsSceneKey && toScene == Shade -> Collapsing(progress)

                    fromScene == Shade || toScene == Shade -> Unsquishing(squishiness)

                    fromScene == QuickSettingsSceneKey || toScene == QuickSettingsSceneKey -> {

                    fromScene == Scenes.Shade && toScene == Scenes.QuickSettings ->

                        Expanding(progress)

                    fromScene == Scenes.QuickSettings && toScene == Scenes.Shade ->

                        Collapsing(progress)

                    fromScene == Scenes.Shade || toScene == Scenes.Shade -> Unsquishing(squishiness)

                    fromScene == Scenes.QuickSettings || toScene == Scenes.QuickSettings -> {

                        QSSceneAdapter.State.QS

                    }

                    else ->

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

+1 −4
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ import com.android.systemui.qs.ui.viewmodel.QuickSettingsSceneViewModel 
import com.android.systemui.res.R

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.ui.composable.ComposableScene

import com.android.systemui.scene.ui.composable.asComposeAware

import com.android.systemui.shade.ui.composable.CollapsedShadeHeader

import com.android.systemui.shade.ui.composable.ExpandedShadeHeader

import com.android.systemui.shade.ui.composable.Shade
@@ -140,9 +139,7 @@ private fun SceneScope.QuickSettingsScene( 
        val isScrollable =

            when (val state = layoutState.transitionState) {

                is TransitionState.Idle -> true

                is TransitionState.Transition -> {

                    state.fromScene == Scenes.QuickSettings.asComposeAware()

                }

                is TransitionState.Transition -> state.fromScene == Scenes.QuickSettings

            }



        LaunchedEffect(isCustomizing, scrollState) {

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

+1 −10
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.scene.ui.composable 


import com.android.compose.animation.scene.Back

import com.android.compose.animation.scene.Edge as ComposeAwareEdge

import com.android.compose.animation.scene.SceneKey as ComposeAwareSceneKey

import com.android.compose.animation.scene.Swipe

import com.android.compose.animation.scene.SwipeDirection

import com.android.compose.animation.scene.TransitionKey as ComposeAwareTransitionKey
@@ -26,20 +25,12 @@ import com.android.compose.animation.scene.UserAction as ComposeAwareUserAction 
import com.android.compose.animation.scene.UserActionResult as ComposeAwareUserActionResult

import com.android.systemui.scene.shared.model.Direction

import com.android.systemui.scene.shared.model.Edge

import com.android.systemui.scene.shared.model.SceneKey

import com.android.systemui.scene.shared.model.TransitionKey

import com.android.systemui.scene.shared.model.UserAction

import com.android.systemui.scene.shared.model.UserActionResult



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



fun SceneKey.asComposeAware(): ComposeAwareSceneKey {

    return ComposeAwareSceneKey(

        debugName = toString(),

        identity = this,

    )

}



fun TransitionKey.asComposeAware(): ComposeAwareTransitionKey {

    return ComposeAwareTransitionKey(

        debugName = debugName,
@@ -75,7 +66,7 @@ fun UserAction.asComposeAware(): ComposeAwareUserAction { 
fun UserActionResult.asComposeAware(): ComposeAwareUserActionResult {

    val composeUnaware = this

    return ComposeAwareUserActionResult(

        toScene = composeUnaware.toScene.asComposeAware(),

        toScene = composeUnaware.toScene,

        transitionKey = composeUnaware.transitionKey?.asComposeAware(),

    )

}