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

Commit c0cd2833 authored by Ned Burns's avatar Ned Burns
Browse files

Rename NotifListBuilderImpl and NewNotifPipeline 

Minor cleanup to better reflect their reponsibilities:

NotifListBuilderImpl -> ShadeListBuilder
NewNotifPipeline -> NotifPipelineInitializer

Test: atest
Change-Id: Ib4cd5f06567129e5720fdcd17ef9a9bc0dcf577b
parent 8172d3ab

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/statusbar/notification/collection/ListDumper.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import java.util.List; 




/**

 * Utility class for dumping the results of a {@link NotifListBuilderImpl} to a debug string.

 * Utility class for dumping the results of a {@link ShadeListBuilder} to a debug string.

 */

public class ListDumper {

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifPipeline.java

+12 −12
Original line number Diff line number Diff line
@@ -68,14 +68,14 @@ import javax.inject.Singleton; 
@Singleton

public class NotifPipeline {

    private final NotifCollection mNotifCollection;

    private final NotifListBuilderImpl mNotifListBuilder;

    private final ShadeListBuilder mShadeListBuilder;



    @Inject

    public NotifPipeline(

            NotifCollection notifCollection,

            NotifListBuilderImpl notifListBuilder) {

            ShadeListBuilder shadeListBuilder) {

        mNotifCollection = notifCollection;

        mNotifListBuilder = notifListBuilder;

        mShadeListBuilder = shadeListBuilder;

    }



    /**
@@ -111,7 +111,7 @@ public class NotifPipeline { 
     * called on that notif).

     */

    public void addPreGroupFilter(NotifFilter filter) {

        mNotifListBuilder.addPreGroupFilter(filter);

        mShadeListBuilder.addPreGroupFilter(filter);

    }



    /**
@@ -119,7 +119,7 @@ public class NotifPipeline { 
     * performed but before NotifPromoters have had a chance to promote children out of groups.

     */

    public void addOnBeforeTransformGroupsListener(OnBeforeTransformGroupsListener listener) {

        mNotifListBuilder.addOnBeforeTransformGroupsListener(listener);

        mShadeListBuilder.addOnBeforeTransformGroupsListener(listener);

    }



    /**
@@ -130,7 +130,7 @@ public class NotifPipeline { 
     * other promoters are called on it).

     */

    public void addPromoter(NotifPromoter promoter) {

        mNotifListBuilder.addPromoter(promoter);

        mShadeListBuilder.addPromoter(promoter);

    }



    /**
@@ -138,7 +138,7 @@ public class NotifPipeline { 
     * have been determined or the notifs have been sorted.

     */

    public void addOnBeforeSortListener(OnBeforeSortListener listener) {

        mNotifListBuilder.addOnBeforeSortListener(listener);

        mShadeListBuilder.addOnBeforeSortListener(listener);

    }



    /**
@@ -149,7 +149,7 @@ public class NotifPipeline { 
     * numerical comparison.

     */

    public void setSectionsProvider(SectionsProvider provider) {

        mNotifListBuilder.setSectionsProvider(provider);

        mShadeListBuilder.setSectionsProvider(provider);

    }



    /**
@@ -158,7 +158,7 @@ public class NotifPipeline { 
     * zero, the pipeline falls back to sorting by rank (and, failing that, Notification.when).

     */

    public void setComparators(List<NotifComparator> comparators) {

        mNotifListBuilder.setComparators(comparators);

        mShadeListBuilder.setComparators(comparators);

    }



    /**
@@ -169,7 +169,7 @@ public class NotifPipeline { 
     * notif).

     */

    public void addPreRenderFilter(NotifFilter filter) {

        mNotifListBuilder.addPreRenderFilter(filter);

        mShadeListBuilder.addPreRenderFilter(filter);

    }



    /**
@@ -177,7 +177,7 @@ public class NotifPipeline { 
     * been handed off to the view layer.

     */

    public void addOnBeforeRenderListListener(OnBeforeRenderListListener listener) {

        mNotifListBuilder.addOnBeforeRenderListListener(listener);

        mShadeListBuilder.addOnBeforeRenderListListener(listener);

    }



    /**
@@ -186,6 +186,6 @@ public class NotifPipeline { 
     * will return the current state of the list, which will likely be only partially-generated.

     */

    public List<ListEntry> getShadeList() {

        return mNotifListBuilder.getShadeList();

        return mShadeListBuilder.getShadeList();

    }

}