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

Commit 33174bca authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Remove some calls to putComponent. 

This gets some of the low hanging fruit out of the way for
deprecation of the SystemUI.mComponents member.

Bug: 138786270
Test: atest SystemUITests
Change-Id: I9388d671a39e8a20973c39489398064c434c31ec
parent a5d8a39a

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -23,8 +23,6 @@ import com.android.keyguard.ViewMediatorCallback; 
import com.android.systemui.statusbar.car.CarFacetButtonController;

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

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

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

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

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

import com.android.systemui.volume.CarVolumeDialogComponent;

import com.android.systemui.volume.VolumeDialogComponent;





import javax.inject.Singleton;

import javax.inject.Singleton;
@@ -57,10 +55,6 @@ public class CarSystemUIFactory extends SystemUIFactory { 
        return new CarStatusBarKeyguardViewManager(context, viewMediatorCallback, lockPatternUtils);

        return new CarStatusBarKeyguardViewManager(context, viewMediatorCallback, lockPatternUtils);

    }

    }





    public VolumeDialogComponent createVolumeDialogComponent(SystemUI systemUi, Context context) {

        return new CarVolumeDialogComponent(systemUi, context);

    }



    @Singleton

    @Singleton

    @Component(modules = ContextHolder.class)

    @Component(modules = ContextHolder.class)

    public interface CarDependencyComponent {

    public interface CarDependencyComponent {

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,8 @@ import com.android.systemui.statusbar.notification.collection.NotificationData; 
import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;

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

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

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

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

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

import com.android.systemui.volume.CarVolumeDialogComponent;

import com.android.systemui.volume.VolumeDialogComponent;





import javax.inject.Named;

import javax.inject.Named;

import javax.inject.Singleton;

import javax.inject.Singleton;
@@ -102,4 +104,8 @@ abstract class CarSystemUIModule { 
    @IntoMap

    @IntoMap

    @ClassKey(StatusBar.class)

    @ClassKey(StatusBar.class)

    public abstract SystemUI providesStatusBar(CarStatusBar statusBar);

    public abstract SystemUI providesStatusBar(CarStatusBar statusBar);



    @Binds

    abstract VolumeDialogComponent bindVolumeDialogComponent(

            CarVolumeDialogComponent carVolumeDialogComponent);

}
 
}

packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogComponent.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -19,15 +19,21 @@ package com.android.systemui.volume; 
import android.content.Context;

import android.content.Context;





import com.android.systemui.SystemUI;

import com.android.systemui.SystemUI;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.plugins.VolumeDialog;

import com.android.systemui.plugins.VolumeDialog;





import javax.inject.Inject;

import javax.inject.Singleton;



/**

/**

 * Allows for adding car specific dialog when the volume dialog is created.

 * Allows for adding car specific dialog when the volume dialog is created.

 */

 */

@Singleton

public class CarVolumeDialogComponent extends VolumeDialogComponent {

public class CarVolumeDialogComponent extends VolumeDialogComponent {





    public CarVolumeDialogComponent(SystemUI sysui, Context context) {

    @Inject

        super(sysui, context);

    public CarVolumeDialogComponent(Context context, KeyguardViewMediator keyguardViewMediator) {

        super(context, keyguardViewMediator);

    }

    }





    protected VolumeDialog createDefault() {

    protected VolumeDialog createDefault() {

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -141,7 +141,6 @@ public class ScreenDecorations extends SystemUI implements Tunable { 
        mHandler = startHandlerThread();

        mHandler = startHandlerThread();

        mHandler.post(this::startOnScreenDecorationsThread);

        mHandler.post(this::startOnScreenDecorationsThread);

        setupStatusBarPaddingIfNeeded();

        setupStatusBarPaddingIfNeeded();

        putComponent(ScreenDecorations.class, this);

    }

    }





    @VisibleForTesting

    @VisibleForTesting

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

+14 −0
Original line number Original line Diff line number Diff line
@@ -17,10 +17,12 @@ 
package com.android.systemui;

package com.android.systemui;





import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.pip.PipUI;

import com.android.systemui.power.PowerUI;

import com.android.systemui.power.PowerUI;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsModule;

import com.android.systemui.recents.RecentsModule;

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

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

import com.android.systemui.volume.VolumeUI;





import dagger.Binds;

import dagger.Binds;

import dagger.Module;

import dagger.Module;
@@ -45,6 +47,12 @@ public abstract class SystemUIBinder { 
    @ClassKey(KeyguardViewMediator.class)

    @ClassKey(KeyguardViewMediator.class)

    public abstract SystemUI bindKeyguardViewMediator(KeyguardViewMediator sysui);

    public abstract SystemUI bindKeyguardViewMediator(KeyguardViewMediator sysui);





    /** Inject into PipUI. */

    @Binds

    @IntoMap

    @ClassKey(PipUI.class)

    public abstract SystemUI bindPipUI(PipUI sysui);



    /** Inject into PowerUI. */

    /** Inject into PowerUI. */

    @Binds

    @Binds

    @IntoMap

    @IntoMap
@@ -57,4 +65,10 @@ public abstract class SystemUIBinder { 
    @ClassKey(Recents.class)

    @ClassKey(Recents.class)

    public abstract SystemUI bindRecents(Recents sysui);

    public abstract SystemUI bindRecents(Recents sysui);





    /** Inject into VolumeUI. */

    @Binds

    @IntoMap

    @ClassKey(VolumeUI.class)

    public abstract SystemUI bindVolumeUI(VolumeUI sysui);



}
 
}