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

Commit 1035b49a authored by Ned Burns's avatar Ned Burns Committed by Android (Google) Code Review
Browse files

Merge changes from topic "rename-pipeline" 

* changes:
  Rename NotifListBuilderImpl and NewNotifPipeline
  Unify pipeline under NotifPipeline wrapper
  Move various pipeline classes into packages
parents 4dbf8103 c0cd2833

packages/CarSystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import com.android.systemui.statusbar.FeatureFlags; 
import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.collection.NotificationRankingManager;

import com.android.systemui.statusbar.notification.collection.NotificationRowBinder;

import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinder;

import com.android.systemui.statusbar.notification.logging.NotifLog;

import com.android.systemui.statusbar.phone.NotificationGroupManager;

import com.android.systemui.util.leak.LeakDetector;

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+4 −4
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ import com.android.systemui.statusbar.notification.NotificationEntryManager; 
import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;

import com.android.systemui.statusbar.notification.VisualStabilityManager;

import com.android.systemui.statusbar.notification.collection.NotificationRowBinderImpl;

import com.android.systemui.statusbar.notification.collection.init.NewNotifPipeline;

import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl;

import com.android.systemui.statusbar.notification.collection.init.NotifPipelineInitializer;

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

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.phone.AutoHideController;
@@ -268,7 +268,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            HeadsUpManagerPhone headsUpManagerPhone,

            DynamicPrivacyController dynamicPrivacyController,

            BypassHeadsUpNotifier bypassHeadsUpNotifier,

            Lazy<NewNotifPipeline> newNotifPipeline,

            Lazy<NotifPipelineInitializer> notifPipelineInitializer,

            FalsingManager falsingManager,

            BroadcastDispatcher broadcastDispatcher,

            RemoteInputQuickSettingsDisabler remoteInputQuickSettingsDisabler,
@@ -355,7 +355,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                headsUpManagerPhone,

                dynamicPrivacyController,

                bypassHeadsUpNotifier,

                newNotifPipeline,

                notifPipelineInitializer,

                falsingManager,

                broadcastDispatcher,

                remoteInputQuickSettingsDisabler,

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java

+4 −4
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ import com.android.systemui.statusbar.notification.NotificationEntryManager; 
import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;

import com.android.systemui.statusbar.notification.VisualStabilityManager;

import com.android.systemui.statusbar.notification.collection.NotificationRowBinderImpl;

import com.android.systemui.statusbar.notification.collection.init.NewNotifPipeline;

import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl;

import com.android.systemui.statusbar.notification.collection.init.NotifPipelineInitializer;

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

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.phone.AutoHideController;
@@ -138,7 +138,7 @@ public class CarStatusBarModule { 
            HeadsUpManagerPhone headsUpManagerPhone,

            DynamicPrivacyController dynamicPrivacyController,

            BypassHeadsUpNotifier bypassHeadsUpNotifier,

            Lazy<NewNotifPipeline> newNotifPipeline,

            Lazy<NotifPipelineInitializer> notifPipelineInitializer,

            FalsingManager falsingManager,

            BroadcastDispatcher broadcastDispatcher,

            RemoteInputQuickSettingsDisabler remoteInputQuickSettingsDisabler,
@@ -224,7 +224,7 @@ public class CarStatusBarModule { 
                headsUpManagerPhone,

                dynamicPrivacyController,

                bypassHeadsUpNotifier,

                newNotifPipeline,

                notifPipelineInitializer,

                falsingManager,

                broadcastDispatcher,

                remoteInputQuickSettingsDisabler,

packages/SystemUI/src/com/android/systemui/ForegroundServiceNotificationListener.java

+4 −4
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ import android.util.Log; 
import com.android.internal.statusbar.NotificationVisibility;

import com.android.systemui.statusbar.notification.NotificationEntryListener;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.collection.NotifCollection;

import com.android.systemui.statusbar.notification.collection.NotifCollectionListener;

import com.android.systemui.statusbar.notification.collection.NotifPipeline;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener;



import javax.inject.Inject;

import javax.inject.Singleton;
@@ -49,7 +49,7 @@ public class ForegroundServiceNotificationListener { 
    public ForegroundServiceNotificationListener(Context context,

            ForegroundServiceController foregroundServiceController,

            NotificationEntryManager notificationEntryManager,

            NotifCollection notifCollection) {

            NotifPipeline notifPipeline) {

        mContext = context;

        mForegroundServiceController = foregroundServiceController;
@@ -77,7 +77,7 @@ public class ForegroundServiceNotificationListener { 
        });

        mEntryManager.addNotificationLifetimeExtender(new ForegroundServiceLifetimeExtender());



        notifCollection.addCollectionListener(new NotifCollectionListener() {

        notifPipeline.addCollectionListener(new NotifCollectionListener() {

            @Override

            public void onEntryAdded(NotificationEntry entry) {

                addNotification(entry, entry.getImportance());

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+2 −9
Original line number Diff line number Diff line
@@ -30,10 +30,8 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; 
import com.android.systemui.recents.Recents;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.notification.collection.NotifListBuilderImpl;

import com.android.systemui.statusbar.notification.collection.NotificationRowBinder;

import com.android.systemui.statusbar.notification.collection.NotificationRowBinderImpl;

import com.android.systemui.statusbar.notification.collection.listbuilder.NotifListBuilder;

import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinder;

import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl;

import com.android.systemui.statusbar.notification.people.PeopleHubModule;

import com.android.systemui.statusbar.phone.KeyguardLiftController;

import com.android.systemui.statusbar.phone.StatusBar;
@@ -113,9 +111,4 @@ public abstract class SystemUIModule { 
    @Singleton

    @Binds

    abstract SystemClock bindSystemClock(SystemClockImpl systemClock);



    @Singleton

    @Binds

    abstract NotifListBuilder bindNotifListBuilder(NotifListBuilderImpl impl);



}