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

Commit 7507728a authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Fix SystemUI for dagger 2.47" into main

parents 82470eb3 7f67b860

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifPipelineChoreographer.kt

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ interface NotifPipelineChoreographer { 
object NotifPipelineChoreographerModule



@Module

private interface PrivateModule {

interface PrivateModule {

    @Binds

    fun bindChoreographer(impl: NotifPipelineChoreographerImpl): NotifPipelineChoreographer

}
@@ -59,7 +59,7 @@ private interface PrivateModule { 
private const val TIMEOUT_MS: Long = 100



@SysUISingleton

private class NotifPipelineChoreographerImpl @Inject constructor(

class NotifPipelineChoreographerImpl @Inject constructor(

    private val viewChoreographer: Choreographer,

    @Main private val executor: DelayableExecutor

) : NotifPipelineChoreographer {

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import javax.inject.Inject 
interface SensitiveContentCoordinatorModule



@Module

private interface PrivateSensitiveContentCoordinatorModule {

interface PrivateSensitiveContentCoordinatorModule {

    @Binds

    fun bindCoordinator(impl: SensitiveContentCoordinatorImpl): SensitiveContentCoordinator

}
@@ -47,7 +47,7 @@ private interface PrivateSensitiveContentCoordinatorModule { 
interface SensitiveContentCoordinator : Coordinator



@CoordinatorScope

private class SensitiveContentCoordinatorImpl @Inject constructor(

class SensitiveContentCoordinatorImpl @Inject constructor(

    private val dynamicPrivacyController: DynamicPrivacyController,

    private val lockscreenUserManager: NotificationLockscreenUserManager,

    private val keyguardUpdateMonitor: KeyguardUpdateMonitor,

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/dagger/CoordinatorsModule.kt

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ interface CoordinatorsSubcomponent { 
@Module(includes = [

    SensitiveContentCoordinatorModule::class,

])

private abstract class InternalCoordinatorsModule {

abstract class InternalCoordinatorsModule {

    @Binds

    @Internal

    abstract fun bindNotifCoordinators(impl: NotifCoordinatorsImpl): NotifCoordinators

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/SectionHeaderController.kt

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ interface SectionHeaderController { 
}



@SectionHeaderScope

internal class SectionHeaderNodeControllerImpl @Inject constructor(

class SectionHeaderNodeControllerImpl @Inject constructor(

    @NodeLabel override val nodeLabel: String,

    private val layoutInflater: LayoutInflater,

    @HeaderText @StringRes private val headerTextResId: Int,

packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationSectionHeadersModule.kt

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ interface SectionHeaderControllerSubcomponent { 
}



@Module

private abstract class SectionHeaderBindingModule {

abstract class SectionHeaderBindingModule {

    @Binds abstract fun bindsNodeController(impl: SectionHeaderNodeControllerImpl): NodeController

    @Binds abstract fun bindsSectionHeaderController(

        impl: SectionHeaderNodeControllerImpl