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

Commit 16f18f1d authored by Steve Elliott's avatar Steve Elliott
Browse files

Provision test with Dagger 

Bug: 290787599
Test: atest SystemUITests
Change-Id: I9fcd0415dc4d90cd4e93fefeb9d7a7dc8dc1b4cc
parent 9408b29f

packages/SystemUI/src/com/android/systemui/biometrics/dagger/BiometricsModule.kt

+5 −42
Original line number Diff line number Diff line
@@ -16,10 +16,12 @@ 


package com.android.systemui.biometrics.dagger



import com.android.systemui.biometrics.UdfpsUtils

import android.content.res.Resources

import com.android.internal.R

import com.android.systemui.biometrics.EllipseOverlapDetectorParams

import com.android.systemui.biometrics.UdfpsUtils

import com.android.systemui.biometrics.data.repository.DisplayStateRepository

import com.android.systemui.biometrics.data.repository.DisplayStateRepositoryImpl

import com.android.systemui.biometrics.data.repository.FacePropertyRepository

import com.android.systemui.biometrics.data.repository.FacePropertyRepositoryImpl

import com.android.systemui.biometrics.data.repository.FaceSettingsRepository
@@ -28,18 +30,6 @@ import com.android.systemui.biometrics.data.repository.FingerprintPropertyReposi 
import com.android.systemui.biometrics.data.repository.FingerprintPropertyRepositoryImpl

import com.android.systemui.biometrics.data.repository.PromptRepository

import com.android.systemui.biometrics.data.repository.PromptRepositoryImpl

import com.android.systemui.biometrics.data.repository.DisplayStateRepository

import com.android.systemui.biometrics.data.repository.DisplayStateRepositoryImpl

import com.android.systemui.biometrics.domain.interactor.CredentialInteractor

import com.android.systemui.biometrics.domain.interactor.CredentialInteractorImpl

import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractor

import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractorImpl

import com.android.systemui.biometrics.domain.interactor.LogContextInteractor

import com.android.systemui.biometrics.domain.interactor.LogContextInteractorImpl

import com.android.systemui.biometrics.domain.interactor.PromptSelectorInteractor

import com.android.systemui.biometrics.domain.interactor.PromptSelectorInteractorImpl

import com.android.systemui.biometrics.domain.interactor.SideFpsOverlayInteractor

import com.android.systemui.biometrics.domain.interactor.SideFpsOverlayInteractorImpl

import com.android.systemui.biometrics.udfps.BoundingBoxOverlapDetector

import com.android.systemui.biometrics.udfps.EllipseOverlapDetector

import com.android.systemui.biometrics.udfps.OverlapDetector
@@ -59,9 +49,7 @@ interface BiometricsModule { 
    @SysUISingleton

    fun faceSettings(impl: FaceSettingsRepositoryImpl): FaceSettingsRepository



    @Binds

    @SysUISingleton

    fun faceSensors(impl: FacePropertyRepositoryImpl): FacePropertyRepository

    @Binds @SysUISingleton fun faceSensors(impl: FacePropertyRepositoryImpl): FacePropertyRepository



    @Binds

    @SysUISingleton
@@ -77,30 +65,6 @@ interface BiometricsModule { 
    @SysUISingleton

    fun displayStateRepository(impl: DisplayStateRepositoryImpl): DisplayStateRepository



    @Binds

    @SysUISingleton

    fun providesPromptSelectorInteractor(

        impl: PromptSelectorInteractorImpl

    ): PromptSelectorInteractor



    @Binds

    @SysUISingleton

    fun providesCredentialInteractor(impl: CredentialInteractorImpl): CredentialInteractor



    @Binds

    @SysUISingleton

    fun providesDisplayStateInteractor(impl: DisplayStateInteractorImpl): DisplayStateInteractor



    @Binds

    @SysUISingleton

    fun bindsLogContextInteractor(impl: LogContextInteractorImpl): LogContextInteractor



    @Binds

    @SysUISingleton

    fun providesSideFpsOverlayInteractor(

        impl: SideFpsOverlayInteractorImpl

    ): SideFpsOverlayInteractor



    companion object {

        /** Background [Executor] for HAL related operations. */

        @Provides
@@ -110,8 +74,7 @@ interface BiometricsModule { 
        fun providesPluginExecutor(threadFactory: ThreadFactory): Executor =

            threadFactory.buildExecutorOnNewThread("biometrics")



        @Provides

        fun providesUdfpsUtils(): UdfpsUtils = UdfpsUtils()

        @Provides fun providesUdfpsUtils(): UdfpsUtils = UdfpsUtils()



        @Provides

        @SysUISingleton

packages/SystemUI/src/com/android/systemui/biometrics/domain/BiometricsDomainLayerModule.kt

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

 * Copyright (C) 2023 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.biometrics.domain



import com.android.systemui.biometrics.domain.interactor.CredentialInteractor

import com.android.systemui.biometrics.domain.interactor.CredentialInteractorImpl

import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractor

import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractorImpl

import com.android.systemui.biometrics.domain.interactor.LogContextInteractor

import com.android.systemui.biometrics.domain.interactor.LogContextInteractorImpl

import com.android.systemui.biometrics.domain.interactor.PromptSelectorInteractor

import com.android.systemui.biometrics.domain.interactor.PromptSelectorInteractorImpl

import com.android.systemui.biometrics.domain.interactor.SideFpsOverlayInteractor

import com.android.systemui.biometrics.domain.interactor.SideFpsOverlayInteractorImpl

import com.android.systemui.dagger.SysUISingleton

import dagger.Binds

import dagger.Module



@Module

interface BiometricsDomainLayerModule {



    @Binds

    @SysUISingleton

    fun providesPromptSelectorInteractor(

        impl: PromptSelectorInteractorImpl

    ): PromptSelectorInteractor



    @Binds

    @SysUISingleton

    fun providesCredentialInteractor(impl: CredentialInteractorImpl): CredentialInteractor



    @Binds

    @SysUISingleton

    fun providesDisplayStateInteractor(impl: DisplayStateInteractorImpl): DisplayStateInteractor



    @Binds

    @SysUISingleton

    fun bindsLogContextInteractor(impl: LogContextInteractorImpl): LogContextInteractor



    @Binds

    @SysUISingleton

    fun providesSideFpsOverlayInteractor(

        impl: SideFpsOverlayInteractorImpl

    ): SideFpsOverlayInteractor

}

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

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.systemui.biometrics.FingerprintInteractiveToAuthProvider; 
import com.android.systemui.biometrics.FingerprintReEnrollNotification;

import com.android.systemui.biometrics.UdfpsDisplayModeProvider;

import com.android.systemui.biometrics.dagger.BiometricsModule;

import com.android.systemui.biometrics.domain.BiometricsDomainLayerModule;

import com.android.systemui.bouncer.ui.BouncerViewModule;

import com.android.systemui.classifier.FalsingModule;

import com.android.systemui.clipboardoverlay.dagger.ClipboardOverlayModule;
@@ -122,6 +123,7 @@ import com.android.systemui.temporarydisplay.dagger.TemporaryDisplayModule; 
import com.android.systemui.tuner.dagger.TunerModule;

import com.android.systemui.unfold.SysUIUnfoldModule;

import com.android.systemui.user.UserModule;

import com.android.systemui.user.domain.UserDomainLayerModule;

import com.android.systemui.util.concurrency.SysUIConcurrencyModule;

import com.android.systemui.util.dagger.UtilModule;

import com.android.systemui.util.kotlin.CoroutinesModule;
@@ -162,6 +164,7 @@ import javax.inject.Named; 
        AssistModule.class,

        AuthenticationModule.class,

        BiometricsModule.class,

        BiometricsDomainLayerModule.class,

        BouncerViewModule.class,

        ClipboardOverlayModule.class,

        ClockRegistryModule.class,
@@ -209,6 +212,7 @@ import javax.inject.Named; 
        TelephonyRepositoryModule.class,

        TemporaryDisplayModule.class,

        TunerModule.class,

        UserDomainLayerModule.class,

        UserModule.class,

        UtilModule.class,

        NoteTaskModule.class,

packages/SystemUI/src/com/android/systemui/user/UserModule.java

+0 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.os.UserHandle; 
import com.android.settingslib.users.CreateUserDialogController;

import com.android.settingslib.users.EditUserInfoController;

import com.android.systemui.user.data.repository.UserRepositoryModule;

import com.android.systemui.user.domain.interactor.HeadlessSystemUserModeModule;

import com.android.systemui.user.ui.dialog.UserDialogModule;



import dagger.Module;
@@ -34,7 +33,6 @@ import dagger.Provides; 
        includes = {

                UserDialogModule.class,

                UserRepositoryModule.class,

                HeadlessSystemUserModeModule.class,

        }

)

public abstract class UserModule {

packages/SystemUI/src/com/android/systemui/user/domain/UserDomainLayerModule.kt

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

 * Copyright (C) 2023 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.user.domain



import com.android.systemui.user.domain.interactor.HeadlessSystemUserModeModule

import dagger.Module



@Module(includes = [HeadlessSystemUserModeModule::class]) object UserDomainLayerModule