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

Commit ff63780f authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Remove calls to getComponent(HeadsUpManager.class) 

Bug: 144284870
Test: atest SystemUITests
Change-Id: I08566fdc9a9b52716857dcecc0de65d105530811
parent bc657fff

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

+15 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.systemui.car.CarNotificationInterruptionStateProvider; 
import com.android.systemui.dagger.SystemUIRootComponent;

import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.power.EnhancedEstimates;

import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.recents.Recents;
@@ -38,10 +39,13 @@ import com.android.systemui.statusbar.car.CarStatusBar; 
import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager;

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

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

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

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

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

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

import com.android.systemui.volume.CarVolumeDialogComponent;

import com.android.systemui.volume.VolumeDialogComponent;
@@ -82,6 +86,17 @@ abstract class CarSystemUIModule { 
        return new Divider(context, recentsOptionalLazy);

    }



    @Singleton

    @Provides

    static HeadsUpManagerPhone provideHeadsUpManagerPhone(Context context,

            StatusBarStateController statusBarStateController,

            KeyguardBypassController bypassController) {

        return new HeadsUpManagerPhone(context, statusBarStateController, bypassController);

    }



    @Binds

    abstract HeadsUpManager bindHeadsUpManagerPhone(HeadsUpManagerPhone headsUpManagerPhone);



    @Singleton

    @Provides

    @Named(LEAK_REPORT_EMAIL_NAME)

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

+0 −5
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.systemui.statusbar.StatusBarStateControllerImpl; 
import com.android.systemui.statusbar.SysuiStatusBarStateController;

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

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

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

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

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

import com.android.systemui.statusbar.phone.StatusBarIconController;
@@ -51,7 +50,6 @@ import com.android.systemui.statusbar.policy.ExtensionController; 
import com.android.systemui.statusbar.policy.ExtensionControllerImpl;

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

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

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

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

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

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -259,7 +257,4 @@ public abstract class DependencyBinder { 
    @Binds

    public abstract VolumeComponent provideVolumeComponent(

            VolumeDialogComponent volumeDialogComponent);

    /** */

    @Binds

    public abstract HeadsUpManager bindHeadsUpManager(HeadsUpManagerPhone headsUpManagerPhone);

}

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

+15 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import androidx.annotation.Nullable; 


import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.power.EnhancedEstimates;

import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.recents.Recents;
@@ -34,9 +35,12 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

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

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

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

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



import java.util.Optional;
@@ -93,6 +97,17 @@ abstract class SystemUIDefaultModule { 
        return new Divider(context, recentsOptionalLazy);

    }



    @Singleton

    @Provides

    static HeadsUpManagerPhone provideHeadsUpManagerPhone(Context context,

            StatusBarStateController statusBarStateController,

            KeyguardBypassController bypassController) {

        return new HeadsUpManagerPhone(context, statusBarStateController, bypassController);

    }



    @Binds

    abstract HeadsUpManager bindHeadsUpManagerPhone(HeadsUpManagerPhone headsUpManagerPhone);



    @Provides

    @Singleton

    static Recents provideRecents(Context context, RecentsImplementation recentsImplementation,

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

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.statusbar.notification.people.PeopleHubModule;

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

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

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

import com.android.systemui.util.sensors.AsyncSensorManager;



import javax.inject.Singleton;
@@ -79,6 +80,9 @@ public abstract class SystemUIModule { 
    @BindsOptionalOf

    abstract Divider optionalDivider();



    @BindsOptionalOf

    abstract HeadsUpManager optionalHeadsUpManager();



    @BindsOptionalOf

    abstract Recents optionalRecents();

packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java

+0 −5
Original line number Diff line number Diff line
@@ -52,13 +52,9 @@ import java.io.PrintWriter; 
import java.util.HashSet;

import java.util.Stack;



import javax.inject.Inject;

import javax.inject.Singleton;



/**

 * A implementation of HeadsUpManager for phone and car.

 */

@Singleton

public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable,

        VisualStabilityManager.Callback, OnHeadsUpChangedListener,

        ConfigurationController.ConfigurationListener, StateListener {
@@ -113,7 +109,6 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, 
    ///////////////////////////////////////////////////////////////////////////////////////////////

    //  Constructor:



    @Inject

    public HeadsUpManagerPhone(@NonNull final Context context,

            StatusBarStateController statusBarStateController,

            KeyguardBypassController bypassController) {