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

Commit 64138a94 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Create NotifGroupManagerHelper interface"

parents cb47f799 bc64fb04

packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java

+2 −2
Original line number Diff line number Diff line
@@ -52,10 +52,10 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager; 
import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.NotificationShadeWindowController;

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

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;

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

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

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

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

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

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

import com.android.systemui.statusbar.policy.BatteryController;
@@ -92,7 +92,7 @@ abstract class CarSystemUIModule { 
            Context context,

            StatusBarStateController statusBarStateController,

            KeyguardBypassController bypassController,

            NotificationGroupManager groupManager,

            GroupMembershipManager groupManager,

            ConfigurationController configurationController) {

        return new HeadsUpManagerPhone(context, statusBarStateController, bypassController,

                groupManager, configurationController);

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

+3 −3
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ import com.android.systemui.statusbar.VibratorHelper; 
import com.android.systemui.statusbar.notification.NotificationEntryManager;

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

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

import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy;

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

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

import com.android.systemui.statusbar.notification.row.NotificationBlockingHelperManager;
@@ -88,7 +89,6 @@ import com.android.systemui.statusbar.phone.LightBarController; 
import com.android.systemui.statusbar.phone.LockscreenGestureLogger;

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

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

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

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

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

import com.android.systemui.statusbar.phone.StatusBarIconController;
@@ -276,7 +276,7 @@ public class Dependency { 
    @Inject Lazy<StatusBarStateController> mStatusBarStateController;

    @Inject Lazy<NotificationLockscreenUserManager> mNotificationLockscreenUserManager;

    @Inject Lazy<NotificationGroupAlertTransferHelper> mNotificationGroupAlertTransferHelper;

    @Inject Lazy<NotificationGroupManager> mNotificationGroupManager;

    @Inject Lazy<NotificationGroupManagerLegacy> mNotificationGroupManager;

    @Inject Lazy<VisualStabilityManager> mVisualStabilityManager;

    @Inject Lazy<NotificationGutsManager> mNotificationGutsManager;

    @Inject Lazy<NotificationMediaManager> mNotificationMediaManager;
@@ -468,7 +468,7 @@ public class Dependency { 
        mProviders.put(NotificationLockscreenUserManager.class,

                mNotificationLockscreenUserManager::get);

        mProviders.put(VisualStabilityManager.class, mVisualStabilityManager::get);

        mProviders.put(NotificationGroupManager.class, mNotificationGroupManager::get);

        mProviders.put(NotificationGroupManagerLegacy.class, mNotificationGroupManager::get);

        mProviders.put(NotificationGroupAlertTransferHelper.class,

                mNotificationGroupAlertTransferHelper::get);

        mProviders.put(NotificationMediaManager.class, mNotificationMediaManager::get);

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+7 −8
Original line number Diff line number Diff line
@@ -104,11 +104,11 @@ import com.android.systemui.statusbar.notification.collection.NotifCollection; 
import com.android.systemui.statusbar.notification.collection.NotifPipeline;

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

import com.android.systemui.statusbar.notification.collection.coordinator.BubbleCoordinator;

import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy;

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

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

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider;

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

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

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

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

import com.android.systemui.statusbar.phone.StatusBar;
@@ -164,7 +164,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
    private final BubbleTaskStackListener mTaskStackListener;

    private BubbleExpandListener mExpandListener;

    @Nullable private BubbleStackView.SurfaceSynchronizer mSurfaceSynchronizer;

    private final NotificationGroupManager mNotificationGroupManager;

    private final NotificationGroupManagerLegacy mNotificationGroupManager;

    private final ShadeController mShadeController;

    private final FloatingContentCoordinator mFloatingContentCoordinator;

    private final BubbleDataRepository mDataRepository;
@@ -355,7 +355,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
            NotificationInterruptStateProvider interruptionStateProvider,

            ZenModeController zenModeController,

            NotificationLockscreenUserManager notifUserManager,

            NotificationGroupManager groupManager,

            NotificationGroupManagerLegacy groupManager,

            NotificationEntryManager entryManager,

            NotifPipeline notifPipeline,

            FeatureFlags featureFlags,
@@ -588,11 +588,11 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
                    }

                });



        mNotificationGroupManager.addOnGroupChangeListener(

                new NotificationGroupManager.OnGroupChangeListener() {

        mNotificationGroupManager.registerGroupChangeListener(

                new NotificationGroupManagerLegacy.OnGroupChangeListener() {

                    @Override

                    public void onGroupSuppressionChanged(

                            NotificationGroupManager.NotificationGroup group,

                            NotificationGroupManagerLegacy.NotificationGroup group,

                            boolean suppressed) {

                        // More notifications could be added causing summary to no longer

                        // be suppressed -- in this case need to remove the key.
@@ -650,8 +650,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
                // 3. User removes all bubbles

                // 4. We expect all the removed bubbles AND the summary (note: the summary was

                // never added to the suppressedSummary list in BubbleData, so we add this check)

                NotificationEntry summary =

                        mNotificationGroupManager.getLogicalGroupSummary(entry.getSbn());

                NotificationEntry summary = mNotificationGroupManager.getLogicalGroupSummary(entry);

                if (summary != null) {

                    ArrayList<NotificationEntry> summaryChildren =

                            mNotificationGroupManager.getLogicalChildren(summary.getSbn());

packages/SystemUI/src/com/android/systemui/bubbles/dagger/BubbleModule.java

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager; 
import com.android.systemui.statusbar.NotificationShadeWindowController;

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

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

import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider;

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

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

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.ZenModeController;
@@ -62,7 +62,7 @@ public interface BubbleModule { 
            NotificationInterruptStateProvider interruptionStateProvider,

            ZenModeController zenModeController,

            NotificationLockscreenUserManager notifUserManager,

            NotificationGroupManager groupManager,

            NotificationGroupManagerLegacy groupManager,

            NotificationEntryManager entryManager,

            NotifPipeline notifPipeline,

            FeatureFlags featureFlags,

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

+2 −2
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager; 
import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.NotificationShadeWindowController;

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

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;

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

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

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

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

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

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

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

import com.android.systemui.statusbar.phone.ShadeControllerImpl;
@@ -143,7 +143,7 @@ public abstract class SystemUIDefaultModule { 
            Context context,

            StatusBarStateController statusBarStateController,

            KeyguardBypassController bypassController,

            NotificationGroupManager groupManager,

            GroupMembershipManager groupManager,

            ConfigurationController configurationController) {

        return new HeadsUpManagerPhone(context, statusBarStateController, bypassController,

                groupManager, configurationController);