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

Commit 77ce322f authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Make DefaultBlueprint configurable 

This pulls DefaultBlueprintModule out of LockscreenSceneBlueprintModule,
such as an OEM can provide various default blueprint configurations.

Test: m SystemUI
Flag: NA see ag/26994584
Bug: 334090373
Change-Id: Id6cdcb7303b1009710e38acee1ab50ff30e9d5e4
parent f67efebd

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenSceneBlueprintModule.kt

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.keyguard.ui.composable



import com.android.systemui.keyguard.ui.composable.blueprint.CommunalBlueprintModule

import com.android.systemui.keyguard.ui.composable.blueprint.DefaultBlueprintModule

import com.android.systemui.keyguard.ui.composable.blueprint.ShortcutsBesideUdfpsBlueprintModule

import com.android.systemui.keyguard.ui.composable.blueprint.SplitShadeWeatherClockBlueprintModule

import com.android.systemui.keyguard.ui.composable.blueprint.WeatherClockBlueprintModule
@@ -28,7 +27,6 @@ import dagger.Module 
    includes =

        [

            CommunalBlueprintModule::class,

            DefaultBlueprintModule::class,

            OptionalSectionModule::class,

            ShortcutsBesideUdfpsBlueprintModule::class,

            SplitShadeWeatherClockBlueprintModule::class,

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt

+0 −8
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ import com.android.systemui.keyguard.ui.composable.section.SettingsMenuSection 
import com.android.systemui.keyguard.ui.composable.section.StatusBarSection

import com.android.systemui.keyguard.ui.composable.section.TopAreaSection

import com.android.systemui.keyguard.ui.viewmodel.LockscreenContentViewModel

import dagger.Binds

import dagger.Module

import dagger.multibindings.IntoSet

import java.util.Optional

import javax.inject.Inject
@@ -196,8 +193,3 @@ constructor( 
        }

    }

}
 


@Module

interface DefaultBlueprintModule {

    @Binds @IntoSet fun blueprint(blueprint: DefaultBlueprint): ComposableLockscreenSceneBlueprint

}

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprintModule.kt

0 → 100644
+26 −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.keyguard.ui.composable.blueprint



import dagger.Binds

import dagger.Module

import dagger.multibindings.IntoSet



@Module

interface DefaultBlueprintModule {

    @Binds @IntoSet fun blueprint(blueprint: DefaultBlueprint): ComposableLockscreenSceneBlueprint

}

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

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.systemui.display.ui.viewmodel.ConnectingDisplayViewModel; 
import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.doze.DozeHost;

import com.android.systemui.keyguard.ui.composable.blueprint.DefaultBlueprintModule;

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

import com.android.systemui.media.muteawait.MediaMuteAwaitConnectionCli;

import com.android.systemui.media.nearby.NearbyMediaDevicesManager;
@@ -99,6 +100,7 @@ import javax.inject.Named; 
        BatterySaverModule.class,

        CollapsedStatusBarFragmentStartableModule.class,

        ConnectingDisplayViewModel.StartableModule.class,

        DefaultBlueprintModule.class,

        GestureModule.class,

        HeadsUpModule.class,

        KeyboardShortcutsModule.class,

packages/SystemUI/tests/utils/src/com/android/systemui/SysUITestModule.kt

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.systemui.dagger.qualifiers.Main 
import com.android.systemui.deviceentry.data.repository.FaceWakeUpTriggersConfigModule

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFaceAuthInteractor

import com.android.systemui.deviceentry.domain.interactor.SystemUIDeviceEntryFaceAuthInteractor

import com.android.systemui.keyguard.ui.composable.blueprint.DefaultBlueprintModule

import com.android.systemui.scene.SceneContainerFrameworkModule

import com.android.systemui.scene.shared.flag.SceneContainerFlags

import com.android.systemui.scene.shared.model.SceneContainerConfig
@@ -60,6 +61,7 @@ import kotlinx.coroutines.test.runTest 
            TestMocksModule::class,

            CoroutineTestScopeModule::class,

            FakeSystemUiModule::class,

            DefaultBlueprintModule::class,

            SceneContainerFrameworkModule::class,

            FaceWakeUpTriggersConfigModule::class,

        ]