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

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

Merge "Pass context into the constructor of SystemUI objects."

parents 9a5dafcc a5d8a39a

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

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


    @Inject

    public CarStatusBar(

            Context context,

            LightBarController lightBarController,

            AutoHideController autoHideController,

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

            NotifLog notifLog) {

        super(

                context,

                lightBarController,

                autoHideController,

                keyguardUpdateMonitor,

packages/SystemUI/proguard.flags

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

}

-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 Diff line number Diff line
@@ -41,6 +41,10 @@ public class LatencyTester extends SystemUI { 
    private static final String ACTION_TURN_ON_SCREEN =

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



    public LatencyTester(Context context) {

        super(context);

    }



    @Override

    public void start() {

        if (!Build.IS_DEBUGGABLE) {

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

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

    }



    public ScreenDecorations(Context context) {

        super(context);

    }



    @Override

    public void start() {

        mHandler = startHandlerThread();

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

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



import com.android.systemui.doze.DozeService;

import com.android.systemui.keyguard.KeyguardService;



import dagger.Binds;

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

@Module

public abstract class ServiceBinder {

    /** */

    @Binds

    @IntoMap

    @ClassKey(DozeService.class)

    public abstract Service bindDozeService(DozeService service);



    /** */

    @Binds

    @IntoMap

    @ClassKey(KeyguardService.class)

    public abstract Service bindKeyguardService(KeyguardService service);

}