diff options
3 files changed, 12 insertions, 18 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/back/domain/interactor/BackActionInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/back/domain/interactor/BackActionInteractorTest.kt index cbad133ba4f0..8c7cd619a158 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/back/domain/interactor/BackActionInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/back/domain/interactor/BackActionInteractorTest.kt @@ -114,14 +114,15 @@ class BackActionInteractorTest : SysuiTestCase() { private val backActionInteractor: BackActionInteractor by lazy { BackActionInteractor( - testScope.backgroundScope, - statusBarStateController, - statusBarKeyguardViewManager, - shadeController, - notificationShadeWindowController, - windowRootViewVisibilityInteractor - ) - .apply { this.setup(qsController, shadeBackActionInteractor) } + testScope.backgroundScope, + statusBarStateController, + statusBarKeyguardViewManager, + shadeController, + notificationShadeWindowController, + windowRootViewVisibilityInteractor, + shadeBackActionInteractor, + qsController, + ) } private val powerInteractor = PowerInteractorFactory.create().powerInteractor diff --git a/packages/SystemUI/src/com/android/systemui/back/domain/interactor/BackActionInteractor.kt b/packages/SystemUI/src/com/android/systemui/back/domain/interactor/BackActionInteractor.kt index 5bd7e5455c2b..23045a336a5d 100644 --- a/packages/SystemUI/src/com/android/systemui/back/domain/interactor/BackActionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/back/domain/interactor/BackActionInteractor.kt @@ -47,7 +47,9 @@ constructor( private val statusBarKeyguardViewManager: StatusBarKeyguardViewManager, private val shadeController: ShadeController, private val notificationShadeWindowController: NotificationShadeWindowController, - private val windowRootViewVisibilityInteractor: WindowRootViewVisibilityInteractor + private val windowRootViewVisibilityInteractor: WindowRootViewVisibilityInteractor, + private val shadeBackActionInteractor: ShadeBackActionInteractor, + private val qsController: QuickSettingsController, ) : CoreStartable { private var isCallbackRegistered = false @@ -77,14 +79,6 @@ constructor( get() = notificationShadeWindowController.windowRootView?.viewRootImpl?.onBackInvokedDispatcher - private lateinit var shadeBackActionInteractor: ShadeBackActionInteractor - private lateinit var qsController: QuickSettingsController - - fun setup(qsController: QuickSettingsController, svController: ShadeBackActionInteractor) { - this.qsController = qsController - this.shadeBackActionInteractor = svController - } - override fun start() { scope.launch { windowRootViewVisibilityInteractor.isLockscreenOrShadeVisibleAndInteractive.collect { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 50e92498b114..68fc7a004673 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -1511,7 +1511,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mNotificationShadeWindowController.fetchWindowRootView(); getNotificationShadeWindowViewController().setupExpandedStatusBar(); getNotificationShadeWindowViewController().setupCommunalHubLayout(); - mBackActionInteractor.setup(mQsController, mShadeSurface); } protected NotificationShadeWindowViewController getNotificationShadeWindowViewController() { |