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

Commit 440fad9a authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

[DO NOT MERGE] Make sure smartspace connects when added am: 5739b637 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15952288

Change-Id: I607865e73c2effe2d85f43e4f8191279d97de362
parents 398946c4 5739b637

packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt

+5 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ class LockscreenSmartspaceController @Inject constructor( 
    var stateChangeListener = object : View.OnAttachStateChangeListener {

        override fun onViewAttachedToWindow(v: View) {

            smartspaceViews.add(v as SmartspaceView)

            connectSession()



            updateTextColorFromWallpaper()

            statusBarStateListener.onDozeAmountChanged(0f, statusBarStateController.dozeAmount)
@@ -93,6 +94,10 @@ class LockscreenSmartspaceController @Inject constructor( 


        override fun onViewDetachedFromWindow(v: View) {

            smartspaceViews.remove(v as SmartspaceView)



            if (smartspaceViews.isEmpty()) {

                disconnect()

            }

        }

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt

+3 −2
Original line number Diff line number Diff line
@@ -199,8 +199,9 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { 
        `when`(deviceProvisionedController.isDeviceProvisioned()).thenReturn(false)

        `when`(deviceProvisionedController.isCurrentUserSetup()).thenReturn(false)



        // WHEN a connection attempt is made

        controller.buildAndConnectView(fakeParent)

        // WHEN a connection attempt is made and view is attached

        val view = controller.buildAndConnectView(fakeParent)

        controller.stateChangeListener.onViewAttachedToWindow(view)



        // THEN no session is created

        verify(smartspaceManager, never()).createSmartspaceSession(any())