Merge "Have NPVC act as BrightnessMirrorShowingInteractor" into main (308f5207) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/settings/brightness/domain/interactor/BrightnessMirrorShowingInteractorTest.kt

+1 −3

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.settings.brightness.data.repository.brightnessMirrorShowingRepository
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.test.runTest
		@@ -34,8 +33,7 @@ class BrightnessMirrorShowingInteractorTest : SysuiTestCase() {

		private val kosmos = testKosmos()

		private val underTest =
		BrightnessMirrorShowingInteractor(kosmos.brightnessMirrorShowingRepository)
		private val underTest = kosmos.brightnessMirrorShowingInteractor

		@Test
		fun isShowing_setAndFlow() =

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ import com.android.systemui.power.domain.interactor.PowerInteractor;
		import com.android.systemui.qs.QSFragmentLegacy;
		import com.android.systemui.res.R;
		import com.android.systemui.screenrecord.RecordingController;
		import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractor;
		import com.android.systemui.settings.brightness.data.repository.BrightnessMirrorShowingRepository;
		import com.android.systemui.shade.data.repository.FakeShadeRepository;
		import com.android.systemui.shade.data.repository.ShadeAnimationRepository;
		import com.android.systemui.shade.data.repository.ShadeRepository;
		@@ -314,8 +314,8 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase {
		protected ShadeRepository mShadeRepository;
		protected FakeMSDLPlayer mMSDLPlayer = mKosmos.getMsdlPlayer();

		protected BrightnessMirrorShowingInteractor mBrightnessMirrorShowingInteractor =
		mKosmos.getBrightnessMirrorShowingInteractor();
		protected BrightnessMirrorShowingRepository mBrightnessMirrorShowingRepository =
		mKosmos.getBrightnessMirrorShowingRepository();

		protected final FalsingManagerFake mFalsingManager = new FalsingManagerFake();
		protected final Optional<SysUIUnfoldComponent> mSysUIUnfoldComponent = Optional.empty();
		@@ -588,7 +588,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase {
		mPowerInteractor,
		mKeyguardClockPositionAlgorithm,
		mMSDLPlayer,
		mBrightnessMirrorShowingInteractor,
		mBrightnessMirrorShowingRepository,
		new BlurConfig(0f, 0f));
		mNotificationPanelViewController.initDependencies(
		mCentralSurfaces,

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.DREAMING
		import com.android.systemui.keyguard.shared.model.KeyguardState.LOCKSCREEN
		import com.android.systemui.res.R
		import com.android.systemui.settings.brightness.data.repository.BrightnessMirrorShowingRepository
		import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractor
		import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractorPassThrough
		import com.android.systemui.shade.NotificationShadeWindowView.InteractionEventHandler
		import com.android.systemui.shade.data.repository.ShadeAnimationRepository
		import com.android.systemui.shade.data.repository.ShadeRepositoryImpl
		@@ -143,7 +143,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() {

		private val brightnessMirrorShowingRepository = BrightnessMirrorShowingRepository()
		private val brightnessMirrorShowingInteractor =
		BrightnessMirrorShowingInteractor(brightnessMirrorShowingRepository)
		BrightnessMirrorShowingInteractorPassThrough(brightnessMirrorShowingRepository)

		private lateinit var underTest: NotificationShadeWindowView
		private lateinit var controller: NotificationShadeWindowViewController

packages/SystemUI/src/com/android/systemui/scene/domain/startable/ScrimStartable.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ import com.android.systemui.scene.domain.interactor.SceneInteractor
		import com.android.systemui.scene.shared.flag.SceneContainerFlag
		import com.android.systemui.scene.shared.model.Overlays
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractor
		import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractorPassThrough
		import com.android.systemui.statusbar.phone.DozeServiceHost
		import com.android.systemui.statusbar.phone.ScrimController
		import com.android.systemui.statusbar.phone.ScrimState
		@@ -64,7 +64,7 @@ constructor(
		biometricUnlockInteractor: BiometricUnlockInteractor,
		private val statusBarKeyguardViewManager: StatusBarKeyguardViewManager,
		private val alternateBouncerInteractor: AlternateBouncerInteractor,
		brightnessMirrorShowingInteractor: BrightnessMirrorShowingInteractor,
		brightnessMirrorShowingInteractor: BrightnessMirrorShowingInteractorPassThrough,
		private val dozeServiceHost: DozeServiceHost,
		) : CoreStartable {

packages/SystemUI/src/com/android/systemui/settings/brightness/domain/interactor/BrightnessMirrorShowingInteractor.kt

+13 −4

Original line number	Diff line number	Diff line
		@@ -19,19 +19,28 @@ package com.android.systemui.settings.brightness.domain.interactor
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.settings.brightness.data.repository.BrightnessMirrorShowingRepository
		import javax.inject.Inject
		import kotlinx.coroutines.flow.StateFlow

		interface BrightnessMirrorShowingInteractor {
		val isShowing: StateFlow<Boolean>

		fun setMirrorShowing(showing: Boolean)
		}

		/** This interactor is just a passthrough of the [BrightnessMirrorShowingRepository]. */
		@SysUISingleton
		class BrightnessMirrorShowingInteractor
		class BrightnessMirrorShowingInteractorPassThrough
		@Inject
		constructor(private val brightnessMirrorShowingRepository: BrightnessMirrorShowingRepository) {
		constructor(private val brightnessMirrorShowingRepository: BrightnessMirrorShowingRepository) :
		BrightnessMirrorShowingInteractor {
		/**
		* Whether a brightness mirror is showing (either as a compose overlay or as a separate mirror).
		*
		* This can be used to determine whether other views/composables have to be hidden.
		*/
		val isShowing = brightnessMirrorShowingRepository.isShowing
		override val isShowing = brightnessMirrorShowingRepository.isShowing

		fun setMirrorShowing(showing: Boolean) {
		override fun setMirrorShowing(showing: Boolean) {
		brightnessMirrorShowingRepository.setMirrorShowing(showing)
		}
		}