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

Commit 2d2adf05 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Move SysUITestModule to tests/utils" into main

parents 31d6e26b 487fbf5e

packages/SystemUI/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -294,6 +294,8 @@ filegroup { 
        "tests/src/com/android/systemui/bouncer/ui/viewmodel/KeyguardBouncerViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt",

        // Keyguard helper
@@ -616,6 +618,9 @@ android_robolectric_test { 


    instrumentation_for: "SystemUIRobo-stub",

    java_resource_dirs: ["tests/robolectric/config"],

    plugins: [

        "dagger2-compiler",

    ],

}



// Opt-out config for optimizing the SystemUI target using R8.

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthDialogPanelInteractionDetectorTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ 
package com.android.systemui.biometrics



import androidx.test.filters.SmallTest

import com.android.SysUITestComponent

import com.android.SysUITestModule

import com.android.runCurrent

import com.android.runTest

import com.android.systemui.SysUITestComponent

import com.android.systemui.SysUITestModule

import com.android.systemui.SysuiTestCase

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.flags.FakeFeatureFlagsClassicModule

import com.android.systemui.flags.Flags

import com.android.systemui.runCurrent

import com.android.systemui.runTest

import com.android.systemui.shade.data.repository.FakeShadeRepository

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

import dagger.BindsInstance

packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractorTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.systemui.keyguard.domain.interactor 


import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.SysUITestModule

import com.android.TestMocksModule

import com.android.systemui.SysUITestModule

import com.android.systemui.SysuiTestCase

import com.android.systemui.TestMocksModule

import com.android.systemui.coroutines.collectValues

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.data.repository.FakeKeyguardSurfaceBehindRepository

packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/InWindowLauncherUnlockAnimationInteractorTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.systemui.keyguard.domain.interactor 


import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.SysUITestModule

import com.android.TestMocksModule

import com.android.systemui.SysUITestModule

import com.android.systemui.SysuiTestCase

import com.android.systemui.TestMocksModule

import com.android.systemui.coroutines.collectValues

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.data.repository.FakeKeyguardSurfaceBehindRepository

packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/binder/InWindowLauncherUnlockAnimationManagerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.keyguard.ui.binder 


import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.SysUITestModule

import com.android.systemui.SysUITestModule

import com.android.systemui.SysuiTestCase

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.ui.view.InWindowLauncherUnlockAnimationManager