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

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

Merge "[flexiglass] DisableFlagsInteractor" into main

parents 8a9da474 a707d1d5

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModelTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ import com.android.systemui.qs.panels.ui.viewmodel.setConfigurationForMediaInRow 
import com.android.systemui.res.R

import com.android.systemui.shade.largeScreenHeaderHelper

import com.android.systemui.statusbar.StatusBarState

import com.android.systemui.statusbar.disableflags.data.model.DisableFlagsModel

import com.android.systemui.statusbar.disableflags.data.repository.fakeDisableFlagsRepository

import com.android.systemui.statusbar.disableflags.shared.model.DisableFlagsModel

import com.android.systemui.statusbar.sysuiStatusBarStateController

import com.android.systemui.util.animation.DisappearParameters

import com.google.common.truth.Truth.assertThat

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java

+1 −2
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ import com.android.systemui.statusbar.QsFrameTranslateController; 
import com.android.systemui.statusbar.StatusBarStateControllerImpl;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.disableflags.data.repository.FakeDisableFlagsRepository;

import com.android.systemui.statusbar.notification.ConversationNotificationManager;

import com.android.systemui.statusbar.notification.DynamicPrivacyController;

import com.android.systemui.statusbar.notification.HeadsUpTouchHelper;
@@ -428,7 +427,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
        mShadeInteractor = new ShadeInteractorImpl(

                mTestScope.getBackgroundScope(),

                mKosmos.getDeviceProvisioningInteractor(),

                new FakeDisableFlagsRepository(),

                mKosmos.getDisableFlagsInteractor(),

                mDozeParameters,

                mFakeKeyguardRepository,

                mKeyguardTransitionInteractor,

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java

+2 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ public class QuickSettingsControllerImplBaseTest extends SysuiTestCase { 
    @Mock protected LargeScreenHeaderHelper mLargeScreenHeaderHelper;



    protected FakeDisableFlagsRepository mDisableFlagsRepository =

            new FakeDisableFlagsRepository();

            mKosmos.getFakeDisableFlagsRepository();

    protected FakeKeyguardRepository mKeyguardRepository = new FakeKeyguardRepository();

    protected FakeShadeRepository mShadeRepository = new FakeShadeRepository();
@@ -185,7 +185,7 @@ public class QuickSettingsControllerImplBaseTest extends SysuiTestCase { 
        mShadeInteractor = new ShadeInteractorImpl(

                mTestScope.getBackgroundScope(),

                mKosmos.getDeviceProvisioningInteractor(),

                mDisableFlagsRepository,

                mKosmos.getDisableFlagsInteractor(),

                mDozeParameters,

                mKeyguardRepository,

                keyguardTransitionInteractor,

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/QuickSettingsControllerImplWithCoroutinesTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.systemui.shade 
import android.app.StatusBarManager

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

import androidx.test.filters.SmallTest

import com.android.systemui.statusbar.disableflags.data.model.DisableFlagsModel

import com.android.systemui.statusbar.disableflags.shared.model.DisableFlagsModel

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.cancelChildren
@@ -61,7 +61,7 @@ class QuickSettingsControllerImplWithCoroutinesTest : QuickSettingsControllerImp 
            mDisableFlagsRepository.disableFlags.value =

                DisableFlagsModel(

                    StatusBarManager.DISABLE_NONE,

                    StatusBarManager.DISABLE2_QUICK_SETTINGS

                    StatusBarManager.DISABLE2_QUICK_SETTINGS,

                )

            runCurrent()
@@ -76,7 +76,7 @@ class QuickSettingsControllerImplWithCoroutinesTest : QuickSettingsControllerImp 
            mDisableFlagsRepository.disableFlags.value =

                DisableFlagsModel(

                    StatusBarManager.DISABLE_NONE,

                    StatusBarManager.DISABLE2_NOTIFICATION_SHADE

                    StatusBarManager.DISABLE2_NOTIFICATION_SHADE,

                )

            runCurrent()

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeInteractorImplTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ import com.android.systemui.power.data.repository.fakePowerRepository 
import com.android.systemui.power.shared.model.WakeSleepReason

import com.android.systemui.power.shared.model.WakefulnessState

import com.android.systemui.shade.shadeTestUtil

import com.android.systemui.statusbar.disableflags.data.model.DisableFlagsModel

import com.android.systemui.statusbar.disableflags.data.repository.fakeDisableFlagsRepository

import com.android.systemui.statusbar.disableflags.shared.model.DisableFlagsModel

import com.android.systemui.statusbar.phone.dozeParameters

import com.android.systemui.statusbar.policy.data.repository.fakeDeviceProvisioningRepository

import com.android.systemui.statusbar.policy.data.repository.fakeUserSetupRepository