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

Commit a0a63b42 authored by Steve Elliott's avatar Steve Elliott Committed by Android (Google) Code Review
Browse files

Merge "Make SystemBarUtils injectable + Kosmos fixtures" into main

parents 482b0d2f 6e3d3c0c

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import com.android.systemui.SysuiTestCase 
import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.coroutines.collectValues

import com.android.systemui.flags.Flags

import com.android.systemui.flags.featureFlagsClassic

import com.android.systemui.flags.fakeFeatureFlagsClassic

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

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

import com.android.systemui.keyguard.shared.model.KeyguardState
@@ -48,7 +48,7 @@ class LockscreenToDreamingTransitionViewModelTest : SysuiTestCase() { 


    private val kosmos =

        testKosmos().apply {

            featureFlagsClassic.apply { set(Flags.FULL_SCREEN_USER_SWITCHER, false) }

            fakeFeatureFlagsClassic.apply { set(Flags.FULL_SCREEN_USER_SWITCHER, false) }

        }

    private val testScope = kosmos.testScope

    private val repository = kosmos.fakeKeyguardTransitionRepository

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import com.android.systemui.common.ui.data.repository.fakeConfigurationRepositor 
import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.coroutines.collectValues

import com.android.systemui.flags.Flags

import com.android.systemui.flags.featureFlagsClassic

import com.android.systemui.flags.fakeFeatureFlagsClassic

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

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

import com.android.systemui.keyguard.shared.model.KeyguardState
@@ -49,7 +49,7 @@ import org.junit.runner.RunWith 
class LockscreenToOccludedTransitionViewModelTest : SysuiTestCase() {

    private val kosmos =

        testKosmos().apply {

            featureFlagsClassic.apply { set(Flags.FULL_SCREEN_USER_SWITCHER, false) }

            fakeFeatureFlagsClassic.apply { set(Flags.FULL_SCREEN_USER_SWITCHER, false) }

        }

    private val testScope = kosmos.testScope

    private val repository = kosmos.fakeKeyguardTransitionRepository

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToGoneTransitionViewModelTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import com.android.systemui.SysuiTestCase 
import com.android.systemui.bouncer.domain.interactor.primaryBouncerInteractor

import com.android.systemui.coroutines.collectValues

import com.android.systemui.flags.Flags

import com.android.systemui.flags.featureFlagsClassic

import com.android.systemui.flags.fakeFeatureFlagsClassic

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

import com.android.systemui.keyguard.shared.model.KeyguardState

import com.android.systemui.keyguard.shared.model.TransitionState
@@ -43,7 +43,7 @@ import org.junit.runner.RunWith 
class PrimaryBouncerToGoneTransitionViewModelTest : SysuiTestCase() {

    val kosmos =

        testKosmos().apply {

            featureFlagsClassic.apply {

            fakeFeatureFlagsClassic.apply {

                set(Flags.REFACTOR_KEYGUARD_DISMISS_INTENT, false)

                set(Flags.FULL_SCREEN_USER_SWITCHER, false)

            }

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/NotificationStackAppearanceIntegrationTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import com.android.systemui.SysuiTestCase 
import com.android.systemui.common.shared.model.NotificationContainerBounds

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.Flags

import com.android.systemui.flags.featureFlagsClassic

import com.android.systemui.flags.fakeFeatureFlagsClassic

import com.android.systemui.kosmos.testScope

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

import com.android.systemui.scene.shared.flag.FakeSceneContainerFlags
@@ -51,7 +51,7 @@ class NotificationStackAppearanceIntegrationTest : SysuiTestCase() { 
    private val kosmos =

        testKosmos().apply {

            sceneContainerFlags = FakeSceneContainerFlags(enabled = true)

            featureFlagsClassic.apply {

            fakeFeatureFlagsClassic.apply {

                set(Flags.FULL_SCREEN_USER_SWITCHER, false)

                set(Flags.NSSL_DEBUG_LINES, false)

            }

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

+12 −11
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ import com.android.systemui.statusbar.phone.DozeParameters; 
import com.android.systemui.statusbar.phone.NotificationIconAreaController;

import com.android.systemui.statusbar.phone.NotificationIconContainer;

import com.android.systemui.statusbar.phone.ScreenOffAnimationController;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.ui.SystemBarUtilsState;

import com.android.systemui.util.ViewController;

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

import com.android.systemui.util.settings.SecureSettings;
@@ -105,7 +105,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
    private final NotificationIconContainerAlwaysOnDisplayViewModel mAodIconsViewModel;

    private final KeyguardRootViewModel mKeyguardRootViewModel;

    private final ConfigurationState mConfigurationState;

    private final ConfigurationController mConfigurationController;

    private final SystemBarUtilsState mSystemBarUtilsState;

    private final DozeParameters mDozeParameters;

    private final ScreenOffAnimationController mScreenOffAnimationController;

    private final AlwaysOnDisplayNotificationIconViewStore mAodIconViewStore;
@@ -183,7 +183,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
            KeyguardSliceViewController keyguardSliceViewController,

            NotificationIconAreaController notificationIconAreaController,

            LockscreenSmartspaceController smartspaceController,

            ConfigurationController configurationController,

            SystemBarUtilsState systemBarUtilsState,

            ScreenOffAnimationController screenOffAnimationController,

            StatusBarIconViewBindingFailureTracker iconViewBindingFailureTracker,

            KeyguardUnlockAnimationController keyguardUnlockAnimationController,
@@ -208,7 +208,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
        mKeyguardSliceViewController = keyguardSliceViewController;

        mNotificationIconAreaController = notificationIconAreaController;

        mSmartspaceController = smartspaceController;

        mConfigurationController = configurationController;

        mSystemBarUtilsState = systemBarUtilsState;

        mScreenOffAnimationController = screenOffAnimationController;

        mIconViewBindingFailureTracker = iconViewBindingFailureTracker;

        mSecureSettings = secureSettings;
@@ -619,11 +619,12 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
                    mAodIconsBindHandle.dispose();

                }

                if (nic != null) {

                    final DisposableHandle viewHandle = NotificationIconContainerViewBinder.bind(

                    final DisposableHandle viewHandle =

                            NotificationIconContainerViewBinder.bindWhileAttached(

                                    nic,

                                    mAodIconsViewModel,

                                    mConfigurationState,

                            mConfigurationController,

                                    mSystemBarUtilsState,

                                    mIconViewBindingFailureTracker,

                                    mAodIconViewStore);

                    final DisposableHandle visHandle = KeyguardRootViewBinder.bindAodIconVisibility(