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

Commit fd9046a0 authored by András Kurucz's avatar András Kurucz Committed by Android (Google) Code Review
Browse files

Merge "Convert VisualStabilityCoordinatorTest to Kotlin" into main

parents bf609ca3 1daa5fa0

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.java

deleted100644 → 0
+0 −1001

File deleted.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.kt

0 → 100644
+1007 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/VisibilityLocationProviderKosmos.kt

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

 * Copyright (C) 2025 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.statusbar.notification



import com.android.systemui.kosmos.Kosmos

import org.mockito.kotlin.mock



val Kosmos.visibilityLocationProvider: VisibilityLocationProvider by Kosmos.Fixture { mock() }

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorKosmos.kt

+36 −2
Original line number Diff line number Diff line
@@ -16,7 +16,41 @@ 


package com.android.systemui.statusbar.notification.collection.coordinator



import com.android.systemui.communal.domain.interactor.communalSceneInteractor

import com.android.systemui.concurrency.fakeExecutor

import com.android.systemui.dump.dumpManager

import com.android.systemui.keyguard.domain.interactor.keyguardTransitionInteractor

import com.android.systemui.keyguard.wakefulnessLifecycle

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.util.mockito.mock

import com.android.systemui.kosmos.testScope

import com.android.systemui.plugins.statusbar.statusBarStateController

import com.android.systemui.shade.domain.interactor.shadeAnimationInteractor

import com.android.systemui.shade.domain.interactor.shadeInteractor

import com.android.systemui.statusbar.notification.collection.provider.visualStabilityProvider

import com.android.systemui.statusbar.notification.domain.interactor.seenNotificationsInteractor

import com.android.systemui.statusbar.notification.stack.data.repository.headsUpNotificationRepository

import com.android.systemui.statusbar.notification.visibilityLocationProvider

import com.android.systemui.statusbar.policy.keyguardStateController

import com.android.systemui.util.kotlin.JavaAdapter



var Kosmos.visualStabilityCoordinator by Kosmos.Fixture { mock<VisualStabilityCoordinator>() }
 
var Kosmos.visualStabilityCoordinator: VisualStabilityCoordinator by

    Kosmos.Fixture {

        VisualStabilityCoordinator(

            fakeExecutor,

            fakeExecutor,

            dumpManager,

            headsUpNotificationRepository,

            shadeAnimationInteractor,

            JavaAdapter(testScope.backgroundScope),

            seenNotificationsInteractor,

            statusBarStateController,

            visibilityLocationProvider,

            visualStabilityProvider,

            wakefulnessLifecycle,

            communalSceneInteractor,

            shadeInteractor,

            keyguardTransitionInteractor,

            keyguardStateController,

            visualStabilityCoordinatorLogger,

        )

    }

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorLoggerKosmos.kt

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

 * Copyright (C) 2025 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.statusbar.notification.collection.coordinator



import com.android.systemui.kosmos.Kosmos

import org.mockito.kotlin.mock



val Kosmos.visualStabilityCoordinatorLogger: VisualStabilityCoordinatorLogger by

    Kosmos.Fixture { mock() }