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

Commit b2c09d37 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move call of PulseExpansionHandler.setUp to startable" into main

parents 88c67bde a21220f0

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+0 −1
Original line number Diff line number Diff line
@@ -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) {

packages/SystemUI/src/com/android/systemui/shade/domain/startable/ShadeStartable.kt

+5 −0
Original line number Diff line number Diff line
@@ -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() {

packages/SystemUI/tests/utils/src/com/android/systemui/shade/domain/startable/ShadeStartableKosmos.kt

+4 −0
Original line number Diff line number Diff line
@@ -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,

    )

}