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

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

Merge "Remove some calls to putComponent."

parents 21cbb788 33174bca

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

+0 −6
Original line number 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.CarStatusBarKeyguardViewManager;

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

import com.android.systemui.volume.CarVolumeDialogComponent;

import com.android.systemui.volume.VolumeDialogComponent;



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

    }



    public VolumeDialogComponent createVolumeDialogComponent(SystemUI systemUi, Context context) {

        return new CarVolumeDialogComponent(systemUi, context);

    }



    @Singleton

    @Component(modules = ContextHolder.class)

    public interface CarDependencyComponent {

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

+6 −0
Original line number 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.ShadeController;

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.Singleton;
@@ -102,4 +104,8 @@ abstract class CarSystemUIModule { 
    @IntoMap

    @ClassKey(StatusBar.class)

    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 Diff line number Diff line
@@ -19,15 +19,21 @@ package com.android.systemui.volume; 
import android.content.Context;



import com.android.systemui.SystemUI;

import com.android.systemui.keyguard.KeyguardViewMediator;

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.

 */

@Singleton

public class CarVolumeDialogComponent extends VolumeDialogComponent {



    public CarVolumeDialogComponent(SystemUI sysui, Context context) {

        super(sysui, context);

    @Inject

    public CarVolumeDialogComponent(Context context, KeyguardViewMediator keyguardViewMediator) {

        super(context, keyguardViewMediator);

    }



    protected VolumeDialog createDefault() {

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

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

        mHandler.post(this::startOnScreenDecorationsThread);

        setupStatusBarPaddingIfNeeded();

        putComponent(ScreenDecorations.class, this);

    }



    @VisibleForTesting

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

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



import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.pip.PipUI;

import com.android.systemui.power.PowerUI;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsModule;

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

import com.android.systemui.volume.VolumeUI;



import dagger.Binds;

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

    public abstract SystemUI bindKeyguardViewMediator(KeyguardViewMediator sysui);



    /** Inject into PipUI. */

    @Binds

    @IntoMap

    @ClassKey(PipUI.class)

    public abstract SystemUI bindPipUI(PipUI sysui);



    /** Inject into PowerUI. */

    @Binds

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

    public abstract SystemUI bindRecents(Recents sysui);



    /** Inject into VolumeUI. */

    @Binds

    @IntoMap

    @ClassKey(VolumeUI.class)

    public abstract SystemUI bindVolumeUI(VolumeUI sysui);



}