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

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

Pass context into the constructor of SystemUI objects. 

The next step is to remove `components` from the SystemUI objects
and replace them with Dagger injection.

Bug: 138786270
Test: atest SystemUITests
Change-Id: I27415a8fa8ba0378599356426d849c9cfb9879d2
parent 0fd72921

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -245,6 +245,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 




    @Inject

    @Inject

    public CarStatusBar(

    public CarStatusBar(

            Context context,

            LightBarController lightBarController,

            LightBarController lightBarController,

            AutoHideController autoHideController,

            AutoHideController autoHideController,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            KeyguardUpdateMonitor keyguardUpdateMonitor,
@@ -300,6 +301,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            StatusBarWindowViewController.Builder statusBarWindowViewControllerBuild,

            StatusBarWindowViewController.Builder statusBarWindowViewControllerBuild,

            NotifLog notifLog) {

            NotifLog notifLog) {

        super(

        super(

                context,

                lightBarController,

                lightBarController,

                autoHideController,

                autoHideController,

                keyguardUpdateMonitor,

                keyguardUpdateMonitor,

packages/SystemUI/proguard.flags

+4 −0
Original line number Original line Diff line number Diff line
@@ -35,3 +35,7 @@ 
    *;

    *;

}

}

-keep class androidx.core.app.CoreComponentFactory

-keep class androidx.core.app.CoreComponentFactory



-keep public class * extends com.android.systemui.SystemUI {

    public <init>(android.content.Context);

}
 
 No newline at end of file

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,10 @@ public class LatencyTester extends SystemUI { 
    private static final String ACTION_TURN_ON_SCREEN =

    private static final String ACTION_TURN_ON_SCREEN =

            "com.android.systemui.latency.ACTION_TURN_ON_SCREEN";

            "com.android.systemui.latency.ACTION_TURN_ON_SCREEN";





    public LatencyTester(Context context) {

        super(context);

    }



    @Override

    @Override

    public void start() {

    public void start() {

        if (!Build.IS_DEBUGGABLE) {

        if (!Build.IS_DEBUGGABLE) {

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -132,6 +132,10 @@ public class ScreenDecorations extends SystemUI implements Tunable { 
        return result;

        return result;

    }

    }





    public ScreenDecorations(Context context) {

        super(context);

    }



    @Override

    @Override

    public void start() {

    public void start() {

        mHandler = startHandlerThread();

        mHandler = startHandlerThread();

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui; 
import android.app.Service;

import android.app.Service;





import com.android.systemui.doze.DozeService;

import com.android.systemui.doze.DozeService;

import com.android.systemui.keyguard.KeyguardService;





import dagger.Binds;

import dagger.Binds;

import dagger.Module;

import dagger.Module;
@@ -30,8 +31,15 @@ import dagger.multibindings.IntoMap; 
 */

 */

@Module

@Module

public abstract class ServiceBinder {

public abstract class ServiceBinder {

    /** */

    @Binds

    @Binds

    @IntoMap

    @IntoMap

    @ClassKey(DozeService.class)

    @ClassKey(DozeService.class)

    public abstract Service bindDozeService(DozeService service);

    public abstract Service bindDozeService(DozeService service);



    /** */

    @Binds

    @IntoMap

    @ClassKey(KeyguardService.class)

    public abstract Service bindKeyguardService(KeyguardService service);

}
 
}