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

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

Remove the fork of STL UserActionResult 

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

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt

+1 −1
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ import androidx.compose.runtime.Composable 
import androidx.compose.ui.Modifier

import com.android.compose.animation.scene.ElementKey

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

import com.android.compose.animation.scene.UserActionResult

import com.android.systemui.bouncer.ui.BouncerDialogFactory

import com.android.systemui.bouncer.ui.viewmodel.BouncerViewModel

import com.android.systemui.dagger.SysUISingleton

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

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

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

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

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

import javax.inject.Inject

import kotlinx.coroutines.flow.MutableStateFlow

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalScene.kt

+1 −1
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ package com.android.systemui.communal.ui.compose 
import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

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

import com.android.compose.animation.scene.UserActionResult

import com.android.systemui.communal.ui.viewmodel.CommunalViewModel

import com.android.systemui.dagger.SysUISingleton

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

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

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

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

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

import javax.inject.Inject

import kotlinx.coroutines.flow.MutableStateFlow

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

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 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.UserActionResult

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

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application
@@ -30,7 +31,6 @@ import com.android.systemui.scene.shared.model.Direction 
import com.android.systemui.scene.shared.model.Edge

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

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

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

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

import dagger.Lazy

import javax.inject.Inject

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

+0 −10
Original line number Diff line number Diff line
@@ -21,11 +21,9 @@ 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.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.UserAction

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



// TODO(b/293899074): remove this file once we can use the types from SceneTransitionLayout.
@@ -53,11 +51,3 @@ fun UserAction.asComposeAware(): ComposeAwareUserAction { 
        is UserAction.Back -> Back

    }

}
 


fun UserActionResult.asComposeAware(): ComposeAwareUserActionResult {

    val composeUnaware = this

    return ComposeAwareUserActionResult(

        toScene = composeUnaware.toScene,

        transitionKey = composeUnaware.transitionKey,

    )

}

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

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import androidx.compose.foundation.layout.fillMaxSize 
import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

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

import com.android.compose.animation.scene.UserActionResult

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

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.qs.ui.composable.QuickSettings
@@ -28,7 +29,6 @@ import com.android.systemui.scene.shared.model.Direction 
import com.android.systemui.scene.shared.model.Edge

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

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

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

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel

import javax.inject.Inject

import kotlinx.coroutines.flow.MutableStateFlow