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

Commit 8606268b authored by Fyodor Kyslov's avatar Fyodor Kyslov Committed by Android (Google) Code Review
Browse files

Merge "Revert "Move SysUITestModule to tests/utils"" into main

parents 8745a0b9 b20dae42

packages/SystemUI/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -294,8 +294,6 @@ 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
@@ -618,9 +616,6 @@ 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/utils/src/com/android/systemui/CoroutineTestScopeModule.kt→packages/SystemUI/tests/src/com/android/CoroutineTestScopeModule.kt

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.systemui

package com.android



import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Background

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

+4 −1
Original line number Diff line number Diff line
@@ -13,12 +13,15 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.systemui

package com.android



import android.content.Context

import android.content.res.Resources

import android.testing.TestableContext

import android.testing.TestableResources

import com.android.systemui.FakeSystemUiModule

import com.android.systemui.SysuiTestCase

import com.android.systemui.SysuiTestableContext

import com.android.systemui.broadcast.BroadcastDispatcher

import com.android.systemui.broadcast.FakeBroadcastDispatcher

import com.android.systemui.coroutines.collectLastValue

packages/SystemUI/tests/utils/src/com/android/systemui/TestMocksModule.kt→packages/SystemUI/tests/src/com/android/TestMocksModule.kt

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.systemui

package com.android



import android.app.ActivityManager

import android.app.admin.DevicePolicyManager
@@ -24,6 +24,7 @@ import com.android.internal.logging.MetricsLogger 
import com.android.keyguard.KeyguardSecurityModel

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.keyguard.KeyguardViewController

import com.android.systemui.GuestResumeSessionReceiver

import com.android.systemui.animation.DialogLaunchAnimator

import com.android.systemui.demomode.DemoModeController

import com.android.systemui.dump.DumpManager

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.systemui.SysUITestComponent

import com.android.systemui.SysUITestModule

import com.android.SysUITestComponent

import com.android.SysUITestModule

import com.android.runCurrent

import com.android.runTest

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