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

Commit 714024c5 authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov Committed by Android (Google) Code Review
Browse files

Merge "Introduce TvSystemUIRootComponent"

parents 7ccccb0b 7842bac5
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@
-keep class com.android.systemui.statusbar.tv.TvStatusBar
-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

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@
<!-- These resources are around just to allow their values to be customized
     for different hardware and product builds. -->
<resources>
    <!-- SystemUIFactory component -->
    <string name="config_systemUIFactoryComponent" translatable="false">com.android.systemui.tv.TvSystemUIFactory</string>

    <!-- SystemUI Services: The classes of the stuff to start. -->
    <string-array name="config_systemUIServiceComponents" translatable="false">
        <item>com.android.systemui.util.NotificationChannels</item>
+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import dagger.Module;
 */
@Module(includes = {DefaultActivityBinder.class,
                    DefaultBroadcastReceiverBinder.class,
                    DefaultServiceBinder.class,
                    SystemUIBinder.class})
                    DefaultServiceBinder.class})
public abstract class DefaultComponentBinder {
}
+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ import dagger.Provides;
 * overridden by the System UI implementation.
 */
@Module(includes = {DividerModule.class})
abstract class SystemUIDefaultModule {
public abstract class SystemUIDefaultModule {

    @Singleton
    @Provides
+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import dagger.Component;
        DependencyBinder.class,
        SystemServicesModule.class,
        SystemUIFactory.ContextHolder.class,
        SystemUIBinder.class,
        SystemUIModule.class,
        SystemUIDefaultModule.class})
public interface SystemUIRootComponent {
Loading