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

Commit b4552f1f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move more initialization logic into NotificationsControllerImpl." into... 

Merge "Move more initialization logic into NotificationsControllerImpl." into tm-qpr-dev am: 16d3fd1f

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



Change-Id: Ia33f149f33164e1f8c1283340f672ebff30becfa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ee76fe4 16d3fd1f

packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt

+6 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.systemui.flags.Flags 
import com.android.systemui.people.widget.PeopleSpaceWidgetManager

import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.SnoozeOption

import com.android.systemui.statusbar.NotificationListener

import com.android.systemui.statusbar.NotificationMediaManager

import com.android.systemui.statusbar.NotificationPresenter

import com.android.systemui.statusbar.notification.AnimatedImageNotificationManager

import com.android.systemui.statusbar.notification.NotificationActivityStarter
@@ -38,6 +39,7 @@ import com.android.systemui.statusbar.notification.collection.notifcollection.Co 
import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener

import com.android.systemui.statusbar.notification.collection.render.NotifStackController

import com.android.systemui.statusbar.notification.interruption.HeadsUpViewBinder

import com.android.systemui.statusbar.notification.logging.NotificationLogger

import com.android.systemui.statusbar.notification.logging.NotificationMemoryMonitor

import com.android.systemui.statusbar.notification.row.NotifBindPipelineInitializer

import com.android.systemui.statusbar.notification.stack.NotificationListContainer
@@ -63,7 +65,9 @@ class NotificationsControllerImpl @Inject constructor( 
    private val targetSdkResolver: TargetSdkResolver,

    private val notifPipelineInitializer: Lazy<NotifPipelineInitializer>,

    private val notifBindPipelineInitializer: NotifBindPipelineInitializer,

    private val notificationLogger: NotificationLogger,

    private val notificationRowBinder: NotificationRowBinderImpl,

    private val notificationsMediaManager: NotificationMediaManager,

    private val headsUpViewBinder: HeadsUpViewBinder,

    private val clickerBuilder: NotificationClicker.Builder,

    private val animatedImageNotificationManager: AnimatedImageNotificationManager,
@@ -109,7 +113,8 @@ class NotificationsControllerImpl @Inject constructor( 
                stackController)



        targetSdkResolver.initialize(notifPipeline.get())



        notificationsMediaManager.setUpWithPresenter(presenter)

        notificationLogger.setUpWithContainer(listContainer)

        peopleSpaceWidgetManager.attach(notificationListener)

        fgsNotifListener.init()

        if (featureFlags.isEnabled(Flags.NOTIFICATION_MEMORY_MONITOR_ENABLED)) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+0 −1
Original line number Diff line number Diff line
@@ -1141,7 +1141,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 


        // TODO: Deal with the ugliness that comes from having some of the status bar broken out

        // into fragments, but the rest here, it leaves some awkward lifecycle and whatnot.

        mNotificationLogger.setUpWithContainer(mNotifListContainer);

        mNotificationIconAreaController.setupShelf(mNotificationShelfController);

        mShadeExpansionStateManager.addExpansionListener(mWakeUpCoordinator);

        mUserSwitcherController.init(mNotificationShadeWindowView);

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java

+0 −1
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ class StatusBarNotificationPresenter implements NotificationPresenter, 
            mNotifShadeEventSource.setNotifRemovedByUserCallback(this::maybeEndAmbientPulse);

            notificationInterruptStateProvider.addSuppressor(mInterruptSuppressor);

            mLockscreenUserManager.setUpWithPresenter(this);

            mMediaManager.setUpWithPresenter(this);

            mGutsManager.setUpWithPresenter(

                    this, mNotifListContainer, mOnSettingsClickListener);