diff options
| author | 2024-03-14 11:14:30 +0000 | |
|---|---|---|
| committer | 2024-03-14 11:14:30 +0000 | |
| commit | cf5fa2a35f743624ae1a5c572913fd7cea82346d (patch) | |
| tree | 996a5d3b509fc05f622895fd2c07156838250e12 | |
| parent | caa09b2b43d8e889cf2659e513e47d6990d4df14 (diff) | |
| parent | 657f50e5fb84cb3bbf3ab264d4ee00186aa4472e (diff) | |
Merge "Remove dock requirement to transition to hub when exiting dream" into main
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/dreams/ui/viewmodel/DreamViewModel.kt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/dreams/ui/viewmodel/DreamViewModel.kt b/packages/SystemUI/src/com/android/systemui/dreams/ui/viewmodel/DreamViewModel.kt index 0cb57fb937d2..1b832d4ab98d 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/ui/viewmodel/DreamViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/dreams/ui/viewmodel/DreamViewModel.kt @@ -21,7 +21,6 @@ import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor import com.android.systemui.communal.domain.interactor.CommunalInteractor import com.android.systemui.communal.shared.model.CommunalScenes import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dock.DockManager import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.keyguard.shared.model.TransitionState import com.android.systemui.keyguard.ui.viewmodel.DreamingToGlanceableHubTransitionViewModel @@ -47,7 +46,6 @@ constructor( fromGlanceableHubTransitionInteractor: GlanceableHubToDreamingTransitionViewModel, private val toGlanceableHubTransitionViewModel: DreamingToGlanceableHubTransitionViewModel, private val toLockscreenTransitionViewModel: DreamingToLockscreenTransitionViewModel, - private val dockManager: DockManager, private val communalInteractor: CommunalInteractor, private val keyguardUpdateMonitor: KeyguardUpdateMonitor, private val userTracker: UserTracker, @@ -55,8 +53,7 @@ constructor( fun startTransitionFromDream() { val showGlanceableHub = - dockManager.isDocked && - communalInteractor.isCommunalEnabled.value && + communalInteractor.isCommunalEnabled.value && !keyguardUpdateMonitor.isEncryptedOrLockdown(userTracker.userId) if (showGlanceableHub) { toGlanceableHubTransitionViewModel.startTransition() |