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

Commit 77642029 authored by Alex Stetson's avatar Alex Stetson Committed by Android (Google) Code Review
Browse files

Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into sc-v2-dev

parents 411deb3a f2f306e6

packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt

+4 −4
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.view.View 
import android.view.ViewGroup

import android.view.ViewGroupOverlay

import androidx.annotation.VisibleForTesting

import com.android.keyguard.KeyguardViewController

import com.android.systemui.R

import com.android.systemui.animation.Interpolators

import com.android.systemui.dagger.SysUISingleton
@@ -39,7 +40,6 @@ import com.android.systemui.statusbar.StatusBarState 
import com.android.systemui.statusbar.SysuiStatusBarStateController

import com.android.systemui.statusbar.notification.stack.StackStateAnimator

import com.android.systemui.statusbar.phone.KeyguardBypassController

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager

import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.util.Utils
@@ -82,7 +82,7 @@ class MediaHierarchyManager @Inject constructor( 
    private val notifLockscreenUserManager: NotificationLockscreenUserManager,

    configurationController: ConfigurationController,

    wakefulnessLifecycle: WakefulnessLifecycle,

    private val statusBarKeyguardViewManager: StatusBarKeyguardViewManager

    private val keyguardViewController: KeyguardViewController

) {



    /**
@@ -998,7 +998,7 @@ class MediaHierarchyManager @Inject constructor( 


    private fun isLockScreenVisibleToUser(): Boolean {

        return !statusBarStateController.isDozing &&

                !statusBarKeyguardViewManager.isBouncerShowing &&

                !keyguardViewController.isBouncerShowing &&

                statusBarStateController.state == StatusBarState.KEYGUARD &&

                notifLockscreenUserManager.shouldShowLockscreenNotifications() &&

                statusBarStateController.isExpanded &&
@@ -1007,7 +1007,7 @@ class MediaHierarchyManager @Inject constructor( 


    private fun isLockScreenShadeVisibleToUser(): Boolean {

        return !statusBarStateController.isDozing &&

                !statusBarKeyguardViewManager.isBouncerShowing &&

                !keyguardViewController.isBouncerShowing &&

                (statusBarStateController.state == StatusBarState.SHADE_LOCKED ||

                        (statusBarStateController.state == StatusBarState.KEYGUARD && qsExpanded))

    }

packages/SystemUI/tests/src/com/android/systemui/media/MediaHierarchyManagerTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.testing.TestableLooper 
import android.view.ViewGroup

import android.widget.FrameLayout

import androidx.test.filters.SmallTest

import com.android.keyguard.KeyguardViewController

import com.android.systemui.R

import com.android.systemui.SysuiTestCase

import com.android.systemui.controls.controller.ControlsControllerImplTest.Companion.eq
@@ -31,7 +32,6 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager 
import com.android.systemui.statusbar.StatusBarState

import com.android.systemui.statusbar.SysuiStatusBarStateController

import com.android.systemui.statusbar.phone.KeyguardBypassController

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager

import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.util.animation.UniqueObjectHostView
@@ -80,7 +80,7 @@ class MediaHierarchyManagerTest : SysuiTestCase() { 
    @Mock

    private lateinit var wakefulnessLifecycle: WakefulnessLifecycle

    @Mock

    private lateinit var statusBarKeyguardViewManager: StatusBarKeyguardViewManager

    private lateinit var keyguardViewController: KeyguardViewController

    @Mock

    private lateinit var configurationController: ConfigurationController

    @Mock
@@ -110,7 +110,7 @@ class MediaHierarchyManagerTest : SysuiTestCase() { 
                notificationLockscreenUserManager,

                configurationController,

                wakefulnessLifecycle,

                statusBarKeyguardViewManager)

                keyguardViewController)

        verify(wakefulnessLifecycle).addObserver(wakefullnessObserver.capture())

        verify(statusBarStateController).addCallback(statusBarCallback.capture())

        setupHost(lockHost, MediaHierarchyManager.LOCATION_LOCKSCREEN)