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

Commit 1e2e36c7 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Remove the fork of STL TransitionKey 

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

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

+1 −10
Original line number Diff line number Diff line
@@ -20,24 +20,15 @@ import com.android.compose.animation.scene.Back 
import com.android.compose.animation.scene.Edge as ComposeAwareEdge

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

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

import com.android.compose.animation.scene.TransitionKey as ComposeAwareTransitionKey

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.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 TransitionKey.asComposeAware(): ComposeAwareTransitionKey {

    return ComposeAwareTransitionKey(

        debugName = debugName,

        identity = this,

    )

}



fun UserAction.asComposeAware(): ComposeAwareUserAction {

    return when (this) {

        is UserAction.Swipe ->
@@ -67,6 +58,6 @@ fun UserActionResult.asComposeAware(): ComposeAwareUserActionResult { 
    val composeUnaware = this

    return ComposeAwareUserActionResult(

        toScene = composeUnaware.toScene,

        transitionKey = composeUnaware.transitionKey?.asComposeAware(),

        transitionKey = composeUnaware.transitionKey,

    )

}

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

+4 −4
Original line number Diff line number Diff line
@@ -32,14 +32,14 @@ val SceneContainerTransitions = transitions { 
    from(

        Scenes.Gone,

        to = Scenes.Shade,

        key = CollapseShadeInstantly.asComposeAware(),

        key = CollapseShadeInstantly,

    ) {

        goneToShadeTransition(durationScale = 0.0)

    }

    from(

        Scenes.Gone,

        to = Scenes.Shade,

        key = SlightlyFasterShadeCollapse.asComposeAware(),

        key = SlightlyFasterShadeCollapse,

    ) {

        goneToShadeTransition(durationScale = 0.9)

    }
@@ -50,14 +50,14 @@ val SceneContainerTransitions = transitions { 
    from(

        Scenes.Lockscreen,

        to = Scenes.Shade,

        key = CollapseShadeInstantly.asComposeAware(),

        key = CollapseShadeInstantly,

    ) {

        lockscreenToShadeTransition(durationScale = 0.0)

    }

    from(

        Scenes.Lockscreen,

        to = Scenes.Shade,

        key = SlightlyFasterShadeCollapse.asComposeAware(),

        key = SlightlyFasterShadeCollapse,

    ) {

        lockscreenToShadeTransition(durationScale = 0.9)

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ package com.android.systemui.scene.ui.composable 
import com.android.compose.animation.scene.MutableSceneTransitionLayoutState

import com.android.compose.animation.scene.ObservableTransitionState

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

import com.android.compose.animation.scene.TransitionKey

import com.android.compose.animation.scene.observableTransitionState

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

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

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.SharingStarted
@@ -73,7 +73,7 @@ class SceneTransitionLayoutDataSource( 
    ) {

        state.setTargetScene(

            targetScene = toScene,

            transitionKey = transitionKey?.asComposeAware(),

            transitionKey = transitionKey,

            coroutineScope = coroutineScope,

        )

    }

packages/SystemUI/src/com/android/systemui/scene/data/repository/SceneContainerRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ 
package com.android.systemui.scene.data.repository



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

import com.android.compose.animation.scene.TransitionKey

import com.android.systemui.dagger.qualifiers.Application

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

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

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

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

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.ExperimentalCoroutinesApi

packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.scene.domain.interactor



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

import com.android.compose.animation.scene.TransitionKey

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.deviceentry.domain.interactor.DeviceUnlockedInteractor
@@ -24,7 +25,6 @@ import com.android.systemui.scene.data.repository.SceneContainerRepository 
import com.android.systemui.scene.shared.logger.SceneLogger

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

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

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

import com.android.systemui.util.kotlin.pairwiseBy

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope