From 657f50e5fb84cb3bbf3ab264d4ee00186aa4472e Mon Sep 17 00:00:00 2001 From: Lucas Silva Date: Wed, 13 Mar 2024 13:39:56 -0400 Subject: Remove dock requirement to transition to hub when exiting dream The desired behavior is that we transition to the hub even when undocked, if the dream is set to "while charging" Bug: 325102385 Test: flashed device and verified we correctly transition when off the dock Flag: ACONFIG com.android.systemui.communal_hub TEAMFOOD Change-Id: I346dc870c4ae6bab3e878e7a73ce6ace85ad311c --- .../src/com/android/systemui/dreams/ui/viewmodel/DreamViewModel.kt | 5 +---- 1 file changed, 1 insertion(+), 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() -- cgit v1.2.3-59-g8ed1b