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

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

Merge "[flexiglass] Rename SceneActionsViewModel to UserActionsViewModel." into main

parents e443db6e ad0e7a64

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

+3 −3
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ import com.android.compose.animation.scene.SceneScope 
import com.android.compose.animation.scene.UserAction

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

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

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

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

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

import com.android.systemui.compose.modifiers.sysuiResTag

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.lifecycle.ExclusiveActivatable
@@ -54,13 +54,13 @@ object Bouncer { 
class BouncerScene

@Inject

constructor(

    private val actionsViewModelFactory: BouncerSceneActionsViewModel.Factory,

    private val actionsViewModelFactory: BouncerUserActionsViewModel.Factory,

    private val contentViewModelFactory: BouncerSceneContentViewModel.Factory,

    private val dialogFactory: BouncerDialogFactory,

) : ExclusiveActivatable(), Scene {

    override val key = Scenes.Bouncer



    private val actionsViewModel: BouncerSceneActionsViewModel by lazy {

    private val actionsViewModel: BouncerUserActionsViewModel by lazy {

        actionsViewModelFactory.create()

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import com.android.compose.animation.scene.UserAction 
import com.android.compose.animation.scene.UserActionResult

import com.android.compose.animation.scene.animateContentFloatAsState

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.ui.viewmodel.LockscreenSceneActionsViewModel

import com.android.systemui.keyguard.ui.viewmodel.LockscreenUserActionsViewModel

import com.android.systemui.lifecycle.ExclusiveActivatable

import com.android.systemui.qs.ui.composable.QuickSettings

import com.android.systemui.scene.shared.model.Scenes
@@ -38,12 +38,12 @@ import kotlinx.coroutines.flow.Flow 
class LockscreenScene

@Inject

constructor(

    actionsViewModelFactory: LockscreenSceneActionsViewModel.Factory,

    actionsViewModelFactory: LockscreenUserActionsViewModel.Factory,

    private val lockscreenContent: Lazy<LockscreenContent>,

) : ExclusiveActivatable(), Scene {

    override val key = Scenes.Lockscreen



    private val actionsViewModel: LockscreenSceneActionsViewModel by lazy {

    private val actionsViewModel: LockscreenUserActionsViewModel by lazy {

        actionsViewModelFactory.create()

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import com.android.systemui.battery.BatteryMeterViewController 
import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.lifecycle.ExclusiveActivatable

import com.android.systemui.lifecycle.rememberViewModel

import com.android.systemui.notifications.ui.viewmodel.NotificationsShadeSceneActionsViewModel

import com.android.systemui.notifications.ui.viewmodel.NotificationsShadeUserActionsViewModel

import com.android.systemui.scene.session.ui.composable.SaveableSession

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

import com.android.systemui.scene.ui.composable.Scene
@@ -49,7 +49,7 @@ import kotlinx.coroutines.flow.Flow 
class NotificationsShadeScene

@Inject

constructor(

    private val actionsViewModelFactory: NotificationsShadeSceneActionsViewModel.Factory,

    private val actionsViewModelFactory: NotificationsShadeUserActionsViewModel.Factory,

    private val shadeHeaderViewModelFactory: ShadeHeaderViewModel.Factory,

    private val notificationsPlaceholderViewModelFactory: NotificationsPlaceholderViewModel.Factory,

    private val tintedIconManagerFactory: TintedIconManager.Factory,
@@ -61,7 +61,7 @@ constructor( 


    override val key = Scenes.NotificationsShade



    private val actionsViewModel: NotificationsShadeSceneActionsViewModel by lazy {

    private val actionsViewModel: NotificationsShadeUserActionsViewModel by lazy {

        actionsViewModelFactory.create()

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ import com.android.systemui.notifications.ui.composable.NotificationStackCutoffG 
import com.android.systemui.qs.footer.ui.compose.FooterActionsWithAnimatedVisibility

import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaLandscapeTopOffset

import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaOffset.InQS

import com.android.systemui.qs.ui.viewmodel.QuickSettingsSceneActionsViewModel

import com.android.systemui.qs.ui.viewmodel.QuickSettingsSceneContentViewModel

import com.android.systemui.qs.ui.viewmodel.QuickSettingsUserActionsViewModel

import com.android.systemui.res.R

import com.android.systemui.scene.session.ui.composable.SaveableSession

import com.android.systemui.scene.shared.model.Scenes
@@ -125,7 +125,7 @@ constructor( 
    private val shadeSession: SaveableSession,

    private val notificationStackScrollView: Lazy<NotificationScrollView>,

    private val notificationsPlaceholderViewModelFactory: NotificationsPlaceholderViewModel.Factory,

    private val actionsViewModelFactory: QuickSettingsSceneActionsViewModel.Factory,

    private val actionsViewModelFactory: QuickSettingsUserActionsViewModel.Factory,

    private val contentViewModelFactory: QuickSettingsSceneContentViewModel.Factory,

    private val tintedIconManagerFactory: TintedIconManager.Factory,

    private val batteryMeterViewControllerFactory: BatteryMeterViewController.Factory,
@@ -135,7 +135,7 @@ constructor( 
) : ExclusiveActivatable(), Scene {

    override val key = Scenes.QuickSettings



    private val actionsViewModel: QuickSettingsSceneActionsViewModel by lazy {

    private val actionsViewModel: QuickSettingsUserActionsViewModel by lazy {

        actionsViewModelFactory.create()

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ import com.android.systemui.battery.BatteryMeterViewController 
import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.lifecycle.ExclusiveActivatable

import com.android.systemui.lifecycle.rememberViewModel

import com.android.systemui.qs.ui.viewmodel.QuickSettingsShadeSceneActionsViewModel

import com.android.systemui.qs.ui.viewmodel.QuickSettingsShadeSceneContentViewModel

import com.android.systemui.qs.ui.viewmodel.QuickSettingsShadeUserActionsViewModel

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

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

import com.android.systemui.shade.ui.composable.ExpandedShadeHeader
@@ -43,7 +43,7 @@ import kotlinx.coroutines.flow.Flow 
class QuickSettingsShadeScene

@Inject

constructor(

    private val actionsViewModelFactory: QuickSettingsShadeSceneActionsViewModel.Factory,

    private val actionsViewModelFactory: QuickSettingsShadeUserActionsViewModel.Factory,

    private val contentViewModelFactory: QuickSettingsShadeSceneContentViewModel.Factory,

    private val shadeHeaderViewModelFactory: ShadeHeaderViewModel.Factory,

    private val tintedIconManagerFactory: TintedIconManager.Factory,
@@ -53,7 +53,7 @@ constructor( 


    override val key = Scenes.QuickSettingsShade



    private val actionsViewModel: QuickSettingsShadeSceneActionsViewModel by lazy {

    private val actionsViewModel: QuickSettingsShadeUserActionsViewModel by lazy {

        actionsViewModelFactory.create()

    }