diff options
3 files changed, 9 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 16d10abb7d99..6b4e44fed0cd 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -1095,7 +1095,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump initBottomArea(); mWakeUpCoordinator.setStackScroller(mNotificationStackScrollLayoutController); - mPulseExpansionHandler.setUp(mNotificationStackScrollLayoutController); mWakeUpCoordinator.addListener(new NotificationWakeUpCoordinator.WakeUpListener() { @Override public void onFullyHiddenChanged(boolean isFullyHidden) { diff --git a/packages/SystemUI/src/com/android/systemui/shade/domain/startable/ShadeStartable.kt b/packages/SystemUI/src/com/android/systemui/shade/domain/startable/ShadeStartable.kt index 3f4bcba288b7..354d379d2ea2 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/domain/startable/ShadeStartable.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/domain/startable/ShadeStartable.kt @@ -32,6 +32,8 @@ import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor import com.android.systemui.shade.shared.flag.DualShade import com.android.systemui.shade.shared.model.ShadeMode import com.android.systemui.shade.transition.ScrimShadeTransitionController +import com.android.systemui.statusbar.PulseExpansionHandler +import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController import com.android.systemui.statusbar.policy.SplitShadeStateController import javax.inject.Inject import javax.inject.Provider @@ -56,6 +58,8 @@ constructor( private val sceneInteractorProvider: Provider<SceneInteractor>, private val panelExpansionInteractorProvider: Provider<PanelExpansionInteractor>, private val shadeExpansionStateManager: ShadeExpansionStateManager, + private val pulseExpansionHandler: PulseExpansionHandler, + private val nsslc: NotificationStackScrollLayoutController, ) : CoreStartable { override fun start() { @@ -63,6 +67,7 @@ constructor( hydrateShadeExpansionStateManager() logTouchesTo(touchLog) scrimShadeTransitionController.init() + pulseExpansionHandler.setUp(nsslc) } private fun hydrateShadeExpansionStateManager() { diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/domain/startable/ShadeStartableKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/domain/startable/ShadeStartableKosmos.kt index b85858d915b5..79b80bc71c58 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/domain/startable/ShadeStartableKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/domain/startable/ShadeStartableKosmos.kt @@ -27,7 +27,9 @@ import com.android.systemui.shade.ShadeExpansionStateManager import com.android.systemui.shade.data.repository.shadeRepository import com.android.systemui.shade.domain.interactor.panelExpansionInteractor import com.android.systemui.shade.transition.ScrimShadeTransitionController +import com.android.systemui.statusbar.notification.stack.notificationStackScrollLayoutController import com.android.systemui.statusbar.policy.splitShadeStateController +import com.android.systemui.statusbar.pulseExpansionHandler import com.android.systemui.util.mockito.mock @Deprecated("ShadeExpansionStateManager is deprecated. Remove your dependency on it instead.") @@ -45,5 +47,7 @@ val Kosmos.shadeStartable by Fixture { sceneInteractorProvider = { sceneInteractor }, panelExpansionInteractorProvider = { panelExpansionInteractor }, shadeExpansionStateManager = shadeExpansionStateManager, + pulseExpansionHandler = pulseExpansionHandler, + nsslc = notificationStackScrollLayoutController, ) } |