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

Commit cf5fa2a3 authored by Lucas Silva's avatar Lucas Silva Committed by Android (Google) Code Review
Browse files

Merge "Remove dock requirement to transition to hub when exiting dream" into main

parents caa09b2b 657f50e5

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

+1 −4
Original line number Original line 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.domain.interactor.CommunalInteractor

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.dagger.SysUISingleton

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.domain.interactor.KeyguardTransitionInteractor

import com.android.systemui.keyguard.shared.model.TransitionState

import com.android.systemui.keyguard.shared.model.TransitionState

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

import com.android.systemui.keyguard.ui.viewmodel.DreamingToGlanceableHubTransitionViewModel
@@ -47,7 +46,6 @@ constructor( 
    fromGlanceableHubTransitionInteractor: GlanceableHubToDreamingTransitionViewModel,

    fromGlanceableHubTransitionInteractor: GlanceableHubToDreamingTransitionViewModel,

    private val toGlanceableHubTransitionViewModel: DreamingToGlanceableHubTransitionViewModel,

    private val toGlanceableHubTransitionViewModel: DreamingToGlanceableHubTransitionViewModel,

    private val toLockscreenTransitionViewModel: DreamingToLockscreenTransitionViewModel,

    private val toLockscreenTransitionViewModel: DreamingToLockscreenTransitionViewModel,

    private val dockManager: DockManager,

    private val communalInteractor: CommunalInteractor,

    private val communalInteractor: CommunalInteractor,

    private val keyguardUpdateMonitor: KeyguardUpdateMonitor,

    private val keyguardUpdateMonitor: KeyguardUpdateMonitor,

    private val userTracker: UserTracker,

    private val userTracker: UserTracker,
@@ -55,7 +53,6 @@ constructor( 




    fun startTransitionFromDream() {

    fun startTransitionFromDream() {

        val showGlanceableHub =

        val showGlanceableHub =

            dockManager.isDocked &&

            communalInteractor.isCommunalEnabled.value &&

            communalInteractor.isCommunalEnabled.value &&

                !keyguardUpdateMonitor.isEncryptedOrLockdown(userTracker.userId)

                !keyguardUpdateMonitor.isEncryptedOrLockdown(userTracker.userId)

        if (showGlanceableHub) {

        if (showGlanceableHub) {