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

Commit 7842bac5 authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov
Browse files

Introduce TvSystemUIRootComponent 

Introduces TvSystemUIFactory and TvSystemUIRootComponent. The purpose of
the former is to substitute "default" SystemUIRootComponent for an
instance of the latter. This CL keeps TvSystemUIRootComponent completely
identical to SystemUIRootComponent, since the goal here is to make the
split. The following CL(s) would modify TvSystemUIRootComponent so that
it only binds SystemUI components that are relevant on TV.

Change-Id: Ib7c6dce2ab65373a1cb25f41fdfcf69fad24ea75
Bug: 146188087
Test: make SystemUI, atest SystemUITests
parent 8fda7a56

packages/SystemUI/proguard.flags

+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

packages/SystemUI/res/values-television/config.xml

+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>

packages/SystemUI/src/com/android/systemui/dagger/DefaultComponentBinder.java

+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 {

}

packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java

+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

packages/SystemUI/src/com/android/systemui/dagger/SystemUIRootComponent.java

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import dagger.Component; 
        DependencyBinder.class,

        SystemServicesModule.class,

        SystemUIFactory.ContextHolder.class,

        SystemUIBinder.class,

        SystemUIModule.class,

        SystemUIDefaultModule.class})

public interface SystemUIRootComponent {