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

Commit dc13b9ad authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

Simplify QSModule 

Create a QSModuleBase with common dependencies (between AOSP and
variants) that can be included by different QSModules

Test: build. QS works correctly.
Fixes: 376091527
Flag: EXEMPT code cleanup
Change-Id: I98c5b9265b9dd30603fb1715acfb264bd578ce47
parent 9789ec82

packages/SystemUI/src/com/android/systemui/qs/dagger/QSModule.java

+3 −48
Original line number Diff line number Diff line
@@ -16,55 +16,10 @@ 


package com.android.systemui.qs.dagger;



import com.android.systemui.media.dagger.MediaModule;

import com.android.systemui.qs.ReduceBrightColorsController;

import com.android.systemui.qs.ReduceBrightColorsControllerImpl;

import com.android.systemui.qs.composefragment.dagger.QSFragmentComposeModule;

import com.android.systemui.qs.external.QSExternalModule;

import com.android.systemui.qs.panels.dagger.PanelsModule;

import com.android.systemui.qs.pipeline.dagger.QSPipelineModule;

import com.android.systemui.qs.tileimpl.QSTileImpl;

import com.android.systemui.qs.tiles.di.QSTilesModule;

import com.android.systemui.qs.ui.adapter.QSSceneAdapter;

import com.android.systemui.qs.ui.adapter.QSSceneAdapterImpl;



import java.util.Map;



import dagger.Binds;

import dagger.Module;

import dagger.multibindings.Multibinds;



/**

 * Module for QS dependencies

 */

@Module(subcomponents = {QSFragmentComponent.class, QSSceneComponent.class},

        includes = {

                MediaModule.class,

                PanelsModule.class,

                QSFragmentComposeModule.class,

                QSExternalModule.class,

                QSFlagsModule.class,

                QSHostModule.class,

                QSPipelineModule.class,

                QSTilesModule.class,

        }

)

public interface QSModule {



    /**

     * A map of internal QS tiles. Ensures that this can be injected even if

     * it is empty

     */

    @Multibinds

    Map<String, QSTileImpl<?>> tileMap();



    @Binds

    QSSceneAdapter bindsQsSceneInteractor(QSSceneAdapterImpl impl);



/**

     * Dims the screen

 * Module for QS dependencies for AOSP inclusion

 */

    @Binds

    ReduceBrightColorsController bindReduceBrightColorsController(

            ReduceBrightColorsControllerImpl impl);

}
 
@Module(includes = { QSModuleBase.class})

public interface QSModule { }

packages/SystemUI/src/com/android/systemui/qs/dagger/QSModuleBase.kt

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.qs.dagger



import com.android.systemui.media.dagger.MediaModule

import com.android.systemui.qs.ReduceBrightColorsController

import com.android.systemui.qs.ReduceBrightColorsControllerImpl

import com.android.systemui.qs.composefragment.dagger.QSFragmentComposeModule

import com.android.systemui.qs.external.QSExternalModule

import com.android.systemui.qs.panels.dagger.PanelsModule

import com.android.systemui.qs.pipeline.dagger.QSPipelineModule

import com.android.systemui.qs.tileimpl.QSTileImpl

import com.android.systemui.qs.tiles.di.QSTilesModule

import com.android.systemui.qs.ui.adapter.QSSceneAdapter

import com.android.systemui.qs.ui.adapter.QSSceneAdapterImpl

import dagger.Binds

import dagger.Module

import dagger.multibindings.Multibinds



/**

 * QS Module for shared dependencies between AOSP and variants. Include this module in more

 * specialized modules (like [QSModule]) and do not include this module directly in SystemUI modules

 */

@Module(

    subcomponents = [QSFragmentComponent::class, QSSceneComponent::class],

    includes =

        [

            MediaModule::class,

            PanelsModule::class,

            QSFragmentComposeModule::class,

            QSExternalModule::class,

            QSFlagsModule::class,

            QSHostModule::class,

            QSPipelineModule::class,

            QSTilesModule::class,

        ],

)

interface QSModuleBase {



    /** A map of internal QS tiles. Ensures that this can be injected even if it is empty */

    @Multibinds fun tileMap(): Map<String?, QSTileImpl<*>?>?



    @Binds fun bindsQsSceneAdapter(impl: QSSceneAdapterImpl?): QSSceneAdapter?



    /** Dims the screen */

    @Binds

    fun bindReduceBrightColorsController(

        impl: ReduceBrightColorsControllerImpl?

    ): ReduceBrightColorsController?

}