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

Commit 8dd660e1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Refactor destinationScenes->userActions + extract interface" into main

parents 78227d92 2f383802

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

+1 −2
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ constructor( 
        actionsViewModelFactory.create()

    }



    override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =

        actionsViewModel.actions

    override val userActions: Flow<Map<UserAction, UserActionResult>> = actionsViewModel.actions



    override suspend fun onActivated(): Nothing {

        actionsViewModel.activate()

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

+3 −3
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ constructor( 
) : ExclusiveActivatable(), Scene {

    override val key = Scenes.Communal



    override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =

        MutableStateFlow<Map<UserAction, UserActionResult>>(

    override val userActions: Flow<Map<UserAction, UserActionResult>> =

        MutableStateFlow(

                mapOf(

                    Swipe(SwipeDirection.End) to UserActionResult(Scenes.Lockscreen),

                    Swipe(SwipeDirection.End) to Scenes.Lockscreen,

                )

            )

            .asStateFlow()

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

+1 −2
Original line number Diff line number Diff line
@@ -47,8 +47,7 @@ constructor( 
        actionsViewModelFactory.create()

    }



    override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =

        actionsViewModel.actions

    override val userActions: Flow<Map<UserAction, UserActionResult>> = actionsViewModel.actions



    override suspend fun onActivated(): Nothing {

        actionsViewModel.activate()

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

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import androidx.compose.runtime.Composable 
import androidx.compose.ui.Modifier

import androidx.compose.ui.unit.dp

import com.android.compose.animation.scene.ContentScope

import com.android.compose.animation.scene.UserAction

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

import com.android.systemui.battery.BatteryMeterViewController

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.lifecycle.rememberViewModel
@@ -39,6 +41,7 @@ import com.android.systemui.statusbar.phone.ui.StatusBarIconController 
import com.android.systemui.statusbar.phone.ui.TintedIconManager

import dagger.Lazy

import javax.inject.Inject

import kotlinx.coroutines.flow.Flow



@SysUISingleton

class NotificationsShadeOverlay
@@ -59,6 +62,8 @@ constructor( 
        actionsViewModelFactory.create()

    }



    override val userActions: Flow<Map<UserAction, UserActionResult>> = actionsViewModel.actions



    override suspend fun activate(): Nothing {

        actionsViewModel.activate()

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ constructor( 
        actionsViewModelFactory.create()

    }



    override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =

        actionsViewModel.actions

    override val userActions: Flow<Map<UserAction, UserActionResult>> = actionsViewModel.actions



    override suspend fun onActivated(): Nothing {

        actionsViewModel.activate()