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

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

Merge "Rename SystemUI class to CoreStartable"

parents 79cb2186 f2da1d5b

packages/SystemUI/proguard.flags

+3 −3
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
-keep class com.android.systemui.car.CarSystemUIFactory

-keep class com.android.systemui.SystemUIFactory

-keep class com.android.systemui.tv.TvSystemUIFactory

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

-keep class * implements com.android.systemui.SystemUI$Injector

-keep class * extends com.android.systemui.CoreStartable

-keep class * implements com.android.systemui.CoreStartable$Injector



-keepclasseswithmembers class * {

    public <init>(android.content.Context, android.util.AttributeSet);
@@ -22,7 +22,7 @@ 
}

-keep class androidx.core.app.CoreComponentFactory



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

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

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

}

packages/SystemUI/src/com/android/systemui/SystemUI.java→packages/SystemUI/src/com/android/systemui/CoreStartable.java

+5 −3
Original line number Diff line number Diff line
@@ -30,17 +30,18 @@ import java.io.PrintWriter; 


/**

 * A top-level module of system UI code (sometimes called "system UI services" elsewhere in code).

 * Which SystemUI modules are loaded can be controlled via a config resource.

 * Which CoreStartable modules are loaded can be controlled via a config resource.

 *

 * @see SystemUIApplication#startServicesIfNeeded()

 */

public abstract class SystemUI implements Dumpable {

public abstract class CoreStartable implements Dumpable {

    protected final Context mContext;



    public SystemUI(Context context) {

    public CoreStartable(Context context) {

        mContext = context;

    }



    /** Main entry point for implementations. Called shortly after app startup. */

    public abstract void start();



    protected void onConfigurationChanged(Configuration newConfig) {
@@ -54,6 +55,7 @@ public abstract class SystemUI implements Dumpable { 
    protected void onBootCompleted() {

    }



    /** TODO(b/205725937): Move this. SystemUIApplication? */

    public static void overrideNotificationAppName(Context context, Notification.Builder n,

            boolean system) {

        final Bundle extras = new Bundle();

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import javax.inject.Inject; 
 * system that are used for testing the latency.

 */

@SysUISingleton

public class LatencyTester extends SystemUI {

public class LatencyTester extends CoreStartable {



    private static final String

            ACTION_FINGERPRINT_WAKE =

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

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ import javax.inject.Inject; 
 * for antialiasing and emulation purposes.

 */

@SysUISingleton

public class ScreenDecorations extends SystemUI implements Tunable {

public class ScreenDecorations extends CoreStartable implements Tunable {

    private static final boolean DEBUG = false;

    private static final String TAG = "ScreenDecorations";

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import javax.inject.Inject; 
 * @see SliceBroadcastRelay

 */

@SysUISingleton

public class SliceBroadcastRelayHandler extends SystemUI {

public class SliceBroadcastRelayHandler extends CoreStartable {

    private static final String TAG = "SliceBroadcastRelay";

    private static final boolean DEBUG = false;