Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[DO NOT MERGE] Make sure smartspace connects when added" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-01 09:43:20 +00:00
committed by Android (Google) Code Review
parent dbb3ce62b0 5739b63774
commit c4c480ab7e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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()
}
}
}

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

@@ -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())