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

Commit b8d1a3b0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Don't use `Kosmos.fakeSceneContainerFlags` in tests that... 

Merge "[flexiglass] Don't use `Kosmos.fakeSceneContainerFlags` in tests that don't need it to be a fake." into main
parents 912d7519 44f8801a

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import com.android.systemui.res.R 
import com.android.systemui.scene.domain.interactor.SceneInteractor

import com.android.systemui.scene.domain.interactor.sceneInteractor

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

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

import com.android.systemui.scene.shared.model.FakeSceneDataSource

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.shared.model.fakeSceneDataSource
@@ -267,7 +268,7 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { 
                falsingManager,

                userSwitcherController,

                featureFlags,

                kosmos.fakeSceneContainerFlags,

                kosmos.sceneContainerFlags,

                globalSettings,

                sessionTracker,

                Optional.of(sideFpsController),

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.systemui.kosmos.testScope 
import com.android.systemui.power.domain.interactor.PowerInteractorFactory

import com.android.systemui.scene.domain.interactor.sceneInteractor

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

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

import com.android.systemui.scene.shared.model.Scenes

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

import com.android.systemui.statusbar.notification.stack.domain.interactor.sharedNotificationContainerInteractor
@@ -75,7 +76,7 @@ class KeyguardInteractorTest : SysuiTestCase() { 
            repository = repository,

            commandQueue = commandQueue,

            powerInteractor = PowerInteractorFactory.create().powerInteractor,

            sceneContainerFlags = kosmos.fakeSceneContainerFlags,

            sceneContainerFlags = kosmos.sceneContainerFlags,

            bouncerRepository = bouncerRepository,

            configurationInteractor = ConfigurationInteractor(FakeConfigurationRepository()),

            shadeRepository = shadeRepository,

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/logging/NotificationLoggerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class NotificationLoggerTest extends SysuiTestCase { 
                mHeadsUpManager,

                mPowerInteractor,

                mActiveNotificationsInteractor,

                mKosmos.getFakeSceneContainerFlags(),

                mKosmos.getSceneContainerFlags(),

                () -> mKosmos.getSceneInteractor());

        mWindowRootViewVisibilityInteractor.setIsLockscreenOrShadeVisible(true);

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java

+1 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static android.app.NotificationManager.IMPORTANCE_DEFAULT; 
import static android.app.NotificationManager.IMPORTANCE_HIGH;

import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE;



import static com.android.systemui.concurrency.FakeExecutorKosmosKt.getFakeExecutor;

import static com.android.systemui.statusbar.NotificationEntryHelper.modifyRanking;



import static junit.framework.Assert.assertNotNull;
@@ -97,7 +96,6 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController; 
import com.android.systemui.statusbar.policy.HeadsUpManager;

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

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

import com.android.systemui.util.time.FakeSystemClock;

import com.android.systemui.wmshell.BubblesManager;



import org.junit.Before;
@@ -182,7 +180,7 @@ public class NotificationGutsManagerTest extends SysuiTestCase { 
                mHeadsUpManager,

                PowerInteractorFactory.create().getPowerInteractor(),

                mActiveNotificationsInteractor,

                mKosmos.getFakeSceneContainerFlags(),

                mKosmos.getSceneContainerFlags(),

                () -> mKosmos.getSceneInteractor()

        );

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase { 
                mKeyguardRepository,

                mCommandQueue,

                PowerInteractorFactory.create().getPowerInteractor(),

                mKosmos.getFakeSceneContainerFlags(),

                mKosmos.getSceneContainerFlags(),

                new FakeKeyguardBouncerRepository(),

                new ConfigurationInteractor(new FakeConfigurationRepository()),

                new FakeShadeRepository(),