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

Commit e31f4f5c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Follow-up CL to resolve comments in ag/34290294" into main

parents 27071bb4 081b7c8c

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

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public abstract class PluginModule { 
    static SysuiDarkIconDispatcher provideSysuiDarkIconDispatcher(

            PerDisplayRepository<SystemUIDisplaySubcomponent> displaySubComponentRepository) {

        return displaySubComponentRepository.get(

                Display.DEFAULT_DISPLAY).getSysUiDarkIconDispatcher();

                Display.DEFAULT_DISPLAY).getSysuiDarkIconDispatcher();

    }



    /** */

packages/SystemUI/src/com/android/systemui/display/dagger/SystemUIDisplaySubcomponent.kt

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ interface SystemUIDisplaySubcomponent { 


    @get:DisplayAware val darkIconDispatcher: DarkIconDispatcher



    @get:DisplayAware val sysUiDarkIconDispatcher: SysuiDarkIconDispatcher

    @get:DisplayAware val sysuiDarkIconDispatcher: SysuiDarkIconDispatcher



    @get:DisplayAware val systemBarUtilsState: SystemBarUtilsState

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusOverlayHoverListener.kt

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ constructor( 
        get() = statusBarConfigurationControllerStore.forDisplay(context.displayId)



    private val View.darkIconDispatcher: SysuiDarkIconDispatcher?

        get() = displaySubcomponentRepository[context.displayId]?.sysUiDarkIconDispatcher

        get() = displaySubcomponentRepository[context.displayId]?.sysuiDarkIconDispatcher



    private fun toHoverTheme(view: View, darkChange: DarkChange): HoverTheme {

        val calculatedTint = DarkIconDispatcher.getTint(darkChange.areas, view, darkChange.tint)

packages/SystemUI/src/com/android/systemui/statusbar/phone/data/repository/DarkIconRepository.kt

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ constructor( 
            )

            return MutableStateFlow(DarkChange.EMPTY)

        }

        val perDisplayDakIconDispatcher = displaySubComponent.sysUiDarkIconDispatcher

        return perDisplayDakIconDispatcher.darkChangeFlow()

        val perDisplayDarkIconDispatcher = displaySubComponent.sysuiDarkIconDispatcher

        return perDisplayDarkIconDispatcher.darkChangeFlow()

    }



    private companion object {

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/HomeStatusBarComponent.java

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.statusbar.phone.fragment.dagger;



import com.android.systemui.battery.BatteryMeterViewController;

import com.android.systemui.dagger.qualifiers.DisplaySpecific;

import com.android.systemui.dagger.qualifiers.RootView;

import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent.DisplayAware;

import com.android.systemui.plugins.DarkIconDispatcher;
@@ -132,6 +131,6 @@ public interface HomeStatusBarComponent { 
    DarkIconDispatcher getDarkIconDispatcher();



    /** */

    @DisplaySpecific

    @DisplayAware

    int getDisplayId();

}