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

Commit 012048d0 authored by Ned Burns's avatar Ned Burns
Browse files

Move various pipeline classes into packages 

Keep the base statusbar.notification.collection package *only* for
classes that need to access package-private members of
NotificationEntry/GroupEntry/etc.

At some point, we should move NotifEntry et al into their own package
like "core" but that will involve a massive scary CL.

Test: atest
Change-Id: I10808f8ce6bd4ae4ce8c1ac194bde6b8a6fea758
parent eac6b7ee

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

+1 −1
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 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.NotificationEntry;

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



import javax.inject.Inject;

import javax.inject.Singleton;

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.systemui.statusbar.NotificationRemoveInterceptor; 
import com.android.systemui.statusbar.NotificationUiAdjustment;

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

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.NotifEvent;

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

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

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

+8 −4
Original line number Diff line number Diff line
@@ -47,9 +47,13 @@ import android.util.ArrayMap; 
import android.util.Log;



import com.android.internal.statusbar.IStatusBarService;

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

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

import com.android.systemui.statusbar.notification.collection.notifcollection.GroupCoalescer.BatchableNotificationHandler;

import com.android.systemui.statusbar.notification.collection.coalescer.CoalescedEvent;

import com.android.systemui.statusbar.notification.collection.coalescer.GroupCoalescer;

import com.android.systemui.statusbar.notification.collection.coalescer.GroupCoalescer.BatchableNotificationHandler;

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

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

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

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

import com.android.systemui.util.Assert;



import java.lang.annotation.Retention;
@@ -446,7 +450,7 @@ public class NotifCollection { 
            REASON_TIMEOUT,

    })

    @Retention(RetentionPolicy.SOURCE)

    @interface CancellationReason {}

    public @interface CancellationReason {}



    public static final int REASON_UNKNOWN = 0;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ import android.service.notification.StatusBarNotification; 
import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.statusbar.NotificationVisibility;

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

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

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

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

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

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

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

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.systemui.statusbar.notification.collection.listbuilder.plugga 
import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter;

import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter;

import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.SectionsProvider;

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

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

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

import com.android.systemui.util.Assert;