commit 657f50e5fb84cb3bbf3ab264d4ee00186aa4472e
author Lucas Silva <lusilva@google.com> Wed Mar 13 13:39:56 2024 -0400
committer Lucas Silva <lusilva@google.com> Wed Mar 13 13:48:09 2024 -0400
tree b2584ecba3735997ab818d7d5288b8c703dcfb81
parent 8ff0d0dc8fa171ad0ce2b25c1915095029b5e8ad

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

packages/SystemUI/src/com/android/systemui/dreams/ui/viewmodel/DreamViewModel.kt

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 0cb57fb..1b832d4 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.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 @@
     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 @@
 
     fun startTransitionFromDream() {
         val showGlanceableHub =
-            dockManager.isDocked &&
-                communalInteractor.isCommunalEnabled.value &&
+            communalInteractor.isCommunalEnabled.value &&
                 !keyguardUpdateMonitor.isEncryptedOrLockdown(userTracker.userId)
         if (showGlanceableHub) {
             toGlanceableHubTransitionViewModel.startTransition()