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

Commit 657f50e5 authored by Lucas Silva's avatar Lucas Silva
Browse files

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
parent 8ff0d0dc

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

+1 −4
Original line number Diff line number Diff line
@@ -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,7 +53,6 @@ constructor( 


    fun startTransitionFromDream() {

        val showGlanceableHub =

            dockManager.isDocked &&

            communalInteractor.isCommunalEnabled.value &&

                !keyguardUpdateMonitor.isEncryptedOrLockdown(userTracker.userId)

        if (showGlanceableHub) {