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

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

Merge "Remove subclasses of NotificationEntryManager"

parents bc0a0675 46597ba6

packages/CarSystemUI/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
    <bool name="config_enableRightNavigationBar">false</bool>

    <bool name="config_enableBottomNavigationBar">true</bool>



    <!-- Disable normal notification rendering; we handle that ourselves -->

    <bool name="config_renderNotifications">false</bool>



    <!-- Whether heads-up notifications should be shown when shade is open. -->

    <bool name="config_enableHeadsUpNotificationWhenNotificationShadeOpen">true</bool>

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

+0 −8
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.systemui.Dependency.LEAK_REPORT_EMAIL_NAME; 
import android.content.Context;



import com.android.systemui.car.CarDeviceProvisionedControllerImpl;

import com.android.systemui.car.CarNotificationEntryManager;

import com.android.systemui.car.CarNotificationInterruptionStateProvider;

import com.android.systemui.dagger.SystemUIRootComponent;

import com.android.systemui.dock.DockManager;
@@ -73,13 +72,6 @@ abstract class CarSystemUIModule { 
        return false;

    }



    /**

     * Use {@link CarNotificationEntryManager}, which does nothing when adding a notification.

     */

    @Binds

    abstract NotificationEntryManager bindNotificationEntryManager(

            CarNotificationEntryManager notificationEntryManager);



    @Singleton

    @Provides

    static HeadsUpManagerPhone provideHeadsUpManagerPhone(Context context,

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

deleted100644 → 0
+0 −62
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.systemui.car;



import android.service.notification.NotificationListenerService;

import android.service.notification.StatusBarNotification;



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.inflation.NotificationRowBinder;

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

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

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



import javax.inject.Inject;

import javax.inject.Singleton;



import dagger.Lazy;



/**

 * Car specific notification entry manager that does nothing when adding a notification.

 *

 * <p> This is because system UI notifications are disabled and we have a different implementation.

 * Please see {@link com.android.car.notification}.

 */

@Singleton

public class CarNotificationEntryManager extends NotificationEntryManager {



    @Inject

    public CarNotificationEntryManager(

            NotifLog notifLog,

            NotificationGroupManager groupManager,

            NotificationRankingManager rankingManager,

            KeyguardEnvironment keyguardEnvironment,

            FeatureFlags featureFlags,

            Lazy<NotificationRowBinder> notificationRowBinderLazy,

            Lazy<NotificationRemoteInputManager> notificationRemoteInputManagerLazy,

            LeakDetector leakDetector) {

        super(notifLog, groupManager, rankingManager, keyguardEnvironment, featureFlags,

                notificationRowBinderLazy, notificationRemoteInputManagerLazy, leakDetector);

    }



    @Override

    public void addNotification(

            StatusBarNotification notification, NotificationListenerService.RankingMap ranking) {

    }

}

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

+3 −21
Original line number Diff line number Diff line
@@ -87,10 +87,8 @@ import com.android.systemui.recents.ScreenPinningRequest; 
import com.android.systemui.shared.plugins.PluginManager;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.FlingAnimationUtils;

import com.android.systemui.statusbar.NavigationBarController;

import com.android.systemui.statusbar.NotificationListener;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;
@@ -103,12 +101,10 @@ import com.android.systemui.statusbar.VibratorHelper; 
import com.android.systemui.statusbar.notification.BypassHeadsUpNotifier;

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

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

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.inflation.NotificationRowBinderImpl;

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

import com.android.systemui.statusbar.notification.init.NotificationsController;

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

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

import com.android.systemui.statusbar.phone.AutoHideController;
@@ -124,7 +120,6 @@ import com.android.systemui.statusbar.phone.LightBarController; 
import com.android.systemui.statusbar.phone.LightsOutNotifController;

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

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

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

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

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

import com.android.systemui.statusbar.phone.ScrimController;
@@ -141,7 +136,6 @@ import com.android.systemui.statusbar.policy.ExtensionController; 
import com.android.systemui.statusbar.policy.KeyguardStateController;

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

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

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

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

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

import com.android.systemui.volume.VolumeComponent;
@@ -257,7 +251,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 


    public CarStatusBar(

            Context context,

            FeatureFlags featureFlags,

            NotificationsController notificationsController,

            LightBarController lightBarController,

            AutoHideController autoHideController,

            KeyguardUpdateMonitor keyguardUpdateMonitor,
@@ -269,13 +263,11 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            HeadsUpManagerPhone headsUpManagerPhone,

            DynamicPrivacyController dynamicPrivacyController,

            BypassHeadsUpNotifier bypassHeadsUpNotifier,

            Lazy<NotifPipelineInitializer> notifPipelineInitializer,

            FalsingManager falsingManager,

            BroadcastDispatcher broadcastDispatcher,

            RemoteInputQuickSettingsDisabler remoteInputQuickSettingsDisabler,

            NotificationGutsManager notificationGutsManager,

            NotificationLogger notificationLogger,

            NotificationEntryManager notificationEntryManager,

            NotificationInterruptionStateProvider notificationInterruptionStateProvider,

            NotificationViewHierarchyManager notificationViewHierarchyManager,

            KeyguardViewMediator keyguardViewMediator,
@@ -296,12 +288,10 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            VibratorHelper vibratorHelper,

            BubbleController bubbleController,

            NotificationGroupManager groupManager,

            NotificationGroupAlertTransferHelper groupAlertTransferHelper,

            VisualStabilityManager visualStabilityManager,

            DeviceProvisionedController deviceProvisionedController,

            NavigationBarController navigationBarController,

            Lazy<AssistManager> assistManagerLazy,

            NotificationListener notificationListener,

            ConfigurationController configurationController,

            NotificationShadeWindowController notificationShadeWindowController,

            LockscreenLockIconController lockscreenLockIconController,
@@ -318,7 +308,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            Optional<Recents> recents,

            Provider<StatusBarComponent.Builder> statusBarComponentBuilder,

            PluginManager pluginManager,

            RemoteInputUriController remoteInputUriController,

            Optional<Divider> dividerOptional,

            SuperStatusBarViewFactory superStatusBarViewFactory,

            LightsOutNotifController lightsOutNotifController,
@@ -334,7 +323,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            KeyguardDismissUtil keyguardDismissUtil,

            ExtensionController extensionController,

            UserInfoControllerImpl userInfoControllerImpl,

            NotificationRowBinderImpl notificationRowBinder,

            DismissCallbackRegistry dismissCallbackRegistry,

            /* Car Settings injected components. */

            CarServiceProvider carServiceProvider,
@@ -345,7 +333,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            FlingAnimationUtils.Builder flingAnimationUtilsBuilder) {

        super(

                context,

                featureFlags,

                notificationsController,

                lightBarController,

                autoHideController,

                keyguardUpdateMonitor,
@@ -357,13 +345,11 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                headsUpManagerPhone,

                dynamicPrivacyController,

                bypassHeadsUpNotifier,

                notifPipelineInitializer,

                falsingManager,

                broadcastDispatcher,

                remoteInputQuickSettingsDisabler,

                notificationGutsManager,

                notificationLogger,

                notificationEntryManager,

                notificationInterruptionStateProvider,

                notificationViewHierarchyManager,

                keyguardViewMediator,
@@ -384,12 +370,10 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                vibratorHelper,

                bubbleController,

                groupManager,

                groupAlertTransferHelper,

                visualStabilityManager,

                deviceProvisionedController,

                navigationBarController,

                assistManagerLazy,

                notificationListener,

                configurationController,

                notificationShadeWindowController,

                lockscreenLockIconController,
@@ -407,7 +391,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                recents,

                statusBarComponentBuilder,

                pluginManager,

                remoteInputUriController,

                dividerOptional,

                lightsOutNotifController,

                statusBarNotificationActivityStarterBuilder,
@@ -422,7 +405,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                keyguardDismissUtil,

                extensionController,

                userInfoControllerImpl,

                notificationRowBinder,

                dismissCallbackRegistry);

        mUserSwitcherController = userSwitcherController;

        mScrimController = scrimController;

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

+3 −21
Original line number Diff line number Diff line
@@ -47,10 +47,8 @@ import com.android.systemui.recents.ScreenPinningRequest; 
import com.android.systemui.shared.plugins.PluginManager;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.FlingAnimationUtils;

import com.android.systemui.statusbar.NavigationBarController;

import com.android.systemui.statusbar.NotificationListener;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;
@@ -63,12 +61,10 @@ import com.android.systemui.statusbar.VibratorHelper; 
import com.android.systemui.statusbar.notification.BypassHeadsUpNotifier;

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

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

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.inflation.NotificationRowBinderImpl;

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

import com.android.systemui.statusbar.notification.init.NotificationsController;

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

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

import com.android.systemui.statusbar.phone.AutoHideController;
@@ -83,7 +79,6 @@ import com.android.systemui.statusbar.phone.LightBarController; 
import com.android.systemui.statusbar.phone.LightsOutNotifController;

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

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

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

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

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

import com.android.systemui.statusbar.phone.ScrimController;
@@ -99,7 +94,6 @@ import com.android.systemui.statusbar.policy.ExtensionController; 
import com.android.systemui.statusbar.policy.KeyguardStateController;

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

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

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

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

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

import com.android.systemui.volume.VolumeComponent;
@@ -127,7 +121,7 @@ public class CarStatusBarModule { 
    @Singleton

    static CarStatusBar provideStatusBar(

            Context context,

            FeatureFlags featureFlags,

            NotificationsController notificationsController,

            LightBarController lightBarController,

            AutoHideController autoHideController,

            KeyguardUpdateMonitor keyguardUpdateMonitor,
@@ -139,13 +133,11 @@ public class CarStatusBarModule { 
            HeadsUpManagerPhone headsUpManagerPhone,

            DynamicPrivacyController dynamicPrivacyController,

            BypassHeadsUpNotifier bypassHeadsUpNotifier,

            Lazy<NotifPipelineInitializer> notifPipelineInitializer,

            FalsingManager falsingManager,

            BroadcastDispatcher broadcastDispatcher,

            RemoteInputQuickSettingsDisabler remoteInputQuickSettingsDisabler,

            NotificationGutsManager notificationGutsManager,

            NotificationLogger notificationLogger,

            NotificationEntryManager notificationEntryManager,

            NotificationInterruptionStateProvider notificationInterruptionStateProvider,

            NotificationViewHierarchyManager notificationViewHierarchyManager,

            KeyguardViewMediator keyguardViewMediator,
@@ -166,12 +158,10 @@ public class CarStatusBarModule { 
            VibratorHelper vibratorHelper,

            BubbleController bubbleController,

            NotificationGroupManager groupManager,

            NotificationGroupAlertTransferHelper groupAlertTransferHelper,

            VisualStabilityManager visualStabilityManager,

            DeviceProvisionedController deviceProvisionedController,

            NavigationBarController navigationBarController,

            Lazy<AssistManager> assistManagerLazy,

            NotificationListener notificationListener,

            ConfigurationController configurationController,

            NotificationShadeWindowController notificationShadeWindowController,

            LockscreenLockIconController lockscreenLockIconController,
@@ -188,7 +178,6 @@ public class CarStatusBarModule { 
            Optional<Recents> recentsOptional,

            Provider<StatusBarComponent.Builder> statusBarComponentBuilder,

            PluginManager pluginManager,

            RemoteInputUriController remoteInputUriController,

            Optional<Divider> dividerOptional,

            SuperStatusBarViewFactory superStatusBarViewFactory,

            LightsOutNotifController lightsOutNotifController,
@@ -204,7 +193,6 @@ public class CarStatusBarModule { 
            KeyguardDismissUtil keyguardDismissUtil,

            ExtensionController extensionController,

            UserInfoControllerImpl userInfoControllerImpl,

            NotificationRowBinderImpl notificationRowBinder,

            DismissCallbackRegistry dismissCallbackRegistry,

            CarServiceProvider carServiceProvider,

            Lazy<PowerManagerHelper> powerManagerHelperLazy,
@@ -214,7 +202,7 @@ public class CarStatusBarModule { 
            FlingAnimationUtils.Builder flingAnimationUtilsBuilder) {

        return new CarStatusBar(

                context,

                featureFlags,

                notificationsController,

                lightBarController,

                autoHideController,

                keyguardUpdateMonitor,
@@ -226,13 +214,11 @@ public class CarStatusBarModule { 
                headsUpManagerPhone,

                dynamicPrivacyController,

                bypassHeadsUpNotifier,

                notifPipelineInitializer,

                falsingManager,

                broadcastDispatcher,

                remoteInputQuickSettingsDisabler,

                notificationGutsManager,

                notificationLogger,

                notificationEntryManager,

                notificationInterruptionStateProvider,

                notificationViewHierarchyManager,

                keyguardViewMediator,
@@ -253,12 +239,10 @@ public class CarStatusBarModule { 
                vibratorHelper,

                bubbleController,

                groupManager,

                groupAlertTransferHelper,

                visualStabilityManager,

                deviceProvisionedController,

                navigationBarController,

                assistManagerLazy,

                notificationListener,

                configurationController,

                notificationShadeWindowController,

                lockscreenLockIconController,
@@ -275,7 +259,6 @@ public class CarStatusBarModule { 
                recentsOptional,

                statusBarComponentBuilder,

                pluginManager,

                remoteInputUriController,

                dividerOptional,

                superStatusBarViewFactory,

                lightsOutNotifController,
@@ -290,7 +273,6 @@ public class CarStatusBarModule { 
                keyguardDismissUtil,

                extensionController,

                userInfoControllerImpl,

                notificationRowBinder,

                dismissCallbackRegistry,

                carServiceProvider,

                powerManagerHelperLazy,