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

Commit 26f70574 authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge "Move StatusBar to constructor injection."

parents 0cfa8916 bb9575f5

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

+8 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.android.systemui.power.EnhancedEstimates; 
import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.car.CarStatusBar;

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

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

import com.android.systemui.statusbar.notification.collection.NotificationData;
@@ -42,6 +43,8 @@ import javax.inject.Singleton; 
import dagger.Binds;

import dagger.Module;

import dagger.Provides;

import dagger.multibindings.ClassKey;

import dagger.multibindings.IntoMap;



@Module

abstract class CarSystemUIModule {
@@ -94,4 +97,9 @@ abstract class CarSystemUIModule { 
    @Binds

    abstract SystemUIRootComponent bindSystemUIRootComponent(

            CarSystemUIRootComponent systemUIRootComponent);



    @Binds

    @IntoMap

    @ClassKey(StatusBar.class)

    public abstract SystemUI providesStatusBar(CarStatusBar statusBar);

}

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

+162 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.systemui.statusbar.car;



import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.ValueAnimator;
@@ -34,6 +36,7 @@ import android.graphics.Rect; 
import android.graphics.drawable.Drawable;

import android.inputmethodservice.InputMethodService;

import android.os.IBinder;

import android.util.DisplayMetrics;

import android.util.Log;

import android.view.Display;

import android.view.GestureDetector;
@@ -57,36 +60,83 @@ import com.android.car.notification.NotificationClickHandlerFactory; 
import com.android.car.notification.NotificationDataManager;

import com.android.car.notification.NotificationViewController;

import com.android.car.notification.PreprocessingManager;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.statusbar.RegisterStatusBarResult;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.BatteryMeterView;

import com.android.systemui.CarSystemUIFactory;

import com.android.systemui.Dependency;

import com.android.systemui.ForegroundServiceController;

import com.android.systemui.Prefs;

import com.android.systemui.R;

import com.android.systemui.SystemUIFactory;

import com.android.systemui.UiOffloadThread;

import com.android.systemui.appops.AppOpsController;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.bubbles.BubbleController;

import com.android.systemui.classifier.FalsingLog;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.doze.DozeLog;

import com.android.systemui.fragments.FragmentHostManager;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.keyguard.ScreenLifecycle;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.qs.QS;

import com.android.systemui.qs.car.CarQSFragment;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.TaskStackChangeListener;

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;

import com.android.systemui.statusbar.NotificationViewHierarchyManager;

import com.android.systemui.statusbar.PulseExpansionHandler;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.car.hvac.HvacController;

import com.android.systemui.statusbar.car.hvac.TemperatureView;

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

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

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

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.logging.NotificationLogger;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

import com.android.systemui.util.InjectionInflationController;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.Map;



import javax.inject.Inject;

import javax.inject.Named;



/**

 * A status bar (and navigation bar) tailored for the automotive use case.

 */
@@ -175,6 +225,8 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
    private boolean mHideNavBarForKeyboard;

    private boolean mBottomNavBarVisible;



    private final NavigationBarController mNavigationBarController;



    private final CarPowerStateListener mCarPowerStateListener =

            (int state) -> {

                // When the car powers on, clear all notifications and mute/unread states.
@@ -189,6 +241,116 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                }

            };



    @Inject

    public CarStatusBar(

            LightBarController lightBarController,

            AutoHideController autoHideController,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            StatusBarIconController statusBarIconController,

            DozeLog dozeLog,

            InjectionInflationController injectionInflationController,

            PulseExpansionHandler pulseExpansionHandler,

            NotificationWakeUpCoordinator notificationWakeUpCoordinator,

            KeyguardBypassController keyguardBypassController,

            KeyguardStateController keyguardStateController,

            HeadsUpManagerPhone headsUpManagerPhone,

            DynamicPrivacyController dynamicPrivacyController,

            BypassHeadsUpNotifier bypassHeadsUpNotifier,

            @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME) boolean allowNotificationLongPress,

            NotifPipelineInitializer notifPipelineInitializer,

            FalsingManager falsingManager,

            BroadcastDispatcher broadcastDispatcher,

            RemoteInputQuickSettingsDisabler remoteInputQuickSettingsDisabler,

            NotificationGutsManager notificationGutsManager,

            NotificationLogger notificationLogger,

            NotificationEntryManager notificationEntryManager,

            NotificationInterruptionStateProvider notificationInterruptionStateProvider,

            NotificationViewHierarchyManager notificationViewHierarchyManager,

            ForegroundServiceController foregroundServiceController,

            AppOpsController appOpsController,

            KeyguardViewMediator keyguardViewMediator,

            ZenModeController zenModeController,

            NotificationAlertingManager notificationAlertingManager,

            DisplayMetrics displayMetrics,

            MetricsLogger metricsLogger,

            UiOffloadThread uiOffloadThread,

            NotificationMediaManager notificationMediaManager,

            NotificationLockscreenUserManager lockScreenUserManager,

            NotificationRemoteInputManager remoteInputManager,

            UserSwitcherController userSwitcherController,

            NetworkController networkController,

            BatteryController batteryController,

            SysuiColorExtractor colorExtractor,

            ScreenLifecycle screenLifecycle,

            WakefulnessLifecycle wakefulnessLifecycle,

            SysuiStatusBarStateController statusBarStateController,

            VibratorHelper vibratorHelper,

            BubbleController bubbleController,

            NotificationGroupManager groupManager,

            NotificationGroupAlertTransferHelper groupAlertTransferHelper,

            VisualStabilityManager visualStabilityManager,

            DeviceProvisionedController deviceProvisionedController,

            NavigationBarController navigationBarController,

            AssistManager assistManager,

            NotificationListener notificationListener,

            ConfigurationController configurationController,

            StatusBarWindowController statusBarWindowController) {

        super(

                lightBarController,

                autoHideController,

                keyguardUpdateMonitor,

                statusBarIconController,

                dozeLog,

                injectionInflationController,

                pulseExpansionHandler,

                notificationWakeUpCoordinator,

                keyguardBypassController,

                keyguardStateController,

                headsUpManagerPhone,

                dynamicPrivacyController,

                bypassHeadsUpNotifier,

                allowNotificationLongPress,

                notifPipelineInitializer,

                falsingManager,

                broadcastDispatcher,

                remoteInputQuickSettingsDisabler,

                notificationGutsManager,

                notificationLogger,

                notificationEntryManager,

                notificationInterruptionStateProvider,

                notificationViewHierarchyManager,

                foregroundServiceController,

                appOpsController,

                keyguardViewMediator,

                zenModeController,

                notificationAlertingManager,

                displayMetrics,

                metricsLogger,

                uiOffloadThread,

                notificationMediaManager,

                lockScreenUserManager,

                remoteInputManager,

                userSwitcherController,

                networkController,

                batteryController,

                colorExtractor,

                screenLifecycle,

                wakefulnessLifecycle,

                statusBarStateController,

                vibratorHelper,

                bubbleController,

                groupManager,

                groupAlertTransferHelper,

                visualStabilityManager,

                deviceProvisionedController,

                navigationBarController,

                assistManager,

                notificationListener,

                configurationController,

                statusBarWindowController);

        mNavigationBarController = navigationBarController;

    }



    @Override

    public void start() {

        // get the provisioned state before calling the parent class since it's that flow that

packages/SystemUI/README.md

+0 −6
Original line number Diff line number Diff line
@@ -104,12 +104,6 @@ it should be shown. 
Shows the drag handle for the divider between two apps when in split screen

mode.



### [com.android.systemui.SystemBars](/packages/SystemUI/src/com/android/systemui/SystemBars.java)



This is a proxy to the actual SystemUI for the status bar. This loads from

config_statusBarComponent which defaults to StatusBar. (maybe this should be

removed and copy how config_systemUiVendorServiceComponent works)



### [com.android.systemui.status.phone.StatusBar](/packages/SystemUI/src/com/android/systemui/status/phone/StatusBar.java)



This shows the UI for the status bar and the notification shade it contains.

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ 
        <item>com.android.systemui.recents.Recents</item>

        <item>com.android.systemui.volume.VolumeUI</item>

        <item>com.android.systemui.stackdivider.Divider</item>

        <item>com.android.systemui.SystemBars</item>

        <item>com.android.systemui.statusbar.phone.StatusBar</item>

        <item>com.android.systemui.usb.StorageNotification</item>

        <item>com.android.systemui.power.PowerUI</item>

        <item>com.android.systemui.media.RingtonePlayer</item>

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

+6 −6
Original line number Diff line number Diff line
@@ -197,6 +197,12 @@ public abstract class DependencyBinder { 
    public abstract StatusBarStateController provideStatusBarStateController(

            StatusBarStateControllerImpl controllerImpl);



    /**

     */

    @Binds

    public abstract SysuiStatusBarStateController providesSysuiStatusBarStateController(

            StatusBarStateControllerImpl statusBarStateControllerImpl);



    /**

     */

    @Binds
@@ -235,10 +241,4 @@ public abstract class DependencyBinder { 
     */

    @Binds

    public abstract FalsingManager provideFalsingmanager(FalsingManagerProxy falsingManagerImpl);



    /**

     */

    @Binds

    public abstract SysuiStatusBarStateController providesSysuiStatusBarStateController(

            StatusBarStateControllerImpl statusBarStateControllerImpl);

}