diff options
13 files changed, 115 insertions, 41 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/settings/brightness/domain/interactor/BrightnessMirrorShowingInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/settings/brightness/domain/interactor/BrightnessMirrorShowingInteractorTest.kt index 31d6df250af3..7b7d76b68d58 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/settings/brightness/domain/interactor/BrightnessMirrorShowingInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/settings/brightness/domain/interactor/BrightnessMirrorShowingInteractorTest.kt @@ -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() = diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java index 904f5e869637..d852a9dc0bb9 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java @@ -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, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt index a8b48363fe07..59e3a2ec08e5 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt @@ -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 diff --git a/packages/SystemUI/src/com/android/systemui/scene/domain/startable/ScrimStartable.kt b/packages/SystemUI/src/com/android/systemui/scene/domain/startable/ScrimStartable.kt index 522dfabb8b61..48b804be98f5 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/domain/startable/ScrimStartable.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/domain/startable/ScrimStartable.kt @@ -17,6 +17,7 @@ package com.android.systemui.scene.domain.startable import androidx.annotation.VisibleForTesting +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.compose.animation.scene.ContentKey import com.android.compose.animation.scene.ObservableTransitionState import com.android.compose.animation.scene.OverlayKey @@ -35,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 @@ -49,7 +50,6 @@ import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach -import com.android.app.tracing.coroutines.launchTraced as launch @SysUISingleton class ScrimStartable @@ -64,7 +64,7 @@ constructor( biometricUnlockInteractor: BiometricUnlockInteractor, private val statusBarKeyguardViewManager: StatusBarKeyguardViewManager, private val alternateBouncerInteractor: AlternateBouncerInteractor, - brightnessMirrorShowingInteractor: BrightnessMirrorShowingInteractor, + brightnessMirrorShowingInteractor: BrightnessMirrorShowingInteractorPassThrough, private val dozeServiceHost: DozeServiceHost, ) : CoreStartable { diff --git a/packages/SystemUI/src/com/android/systemui/settings/brightness/domain/interactor/BrightnessMirrorShowingInteractor.kt b/packages/SystemUI/src/com/android/systemui/settings/brightness/domain/interactor/BrightnessMirrorShowingInteractor.kt index de068a0fa2ea..f2cff9f25739 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/brightness/domain/interactor/BrightnessMirrorShowingInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/settings/brightness/domain/interactor/BrightnessMirrorShowingInteractor.kt @@ -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) } } diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 131efaac3d6a..52af26929c2d 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -42,6 +42,8 @@ import static com.android.systemui.statusbar.notification.stack.StackStateAnimat import static com.android.systemui.util.DumpUtilsKt.asIndenting; import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow; +import static kotlinx.coroutines.flow.StateFlowKt.MutableStateFlow; + import static java.lang.Float.isNaN; import android.animation.Animator; @@ -131,6 +133,7 @@ import com.android.systemui.power.shared.model.WakefulnessModel; import com.android.systemui.qs.flags.QSComposeFragment; import com.android.systemui.res.R; import com.android.systemui.scene.shared.flag.SceneContainerFlag; +import com.android.systemui.settings.brightness.data.repository.BrightnessMirrorShowingRepository; import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractor; import com.android.systemui.shade.data.repository.FlingInfo; import com.android.systemui.shade.data.repository.ShadeRepository; @@ -201,6 +204,7 @@ import kotlin.Unit; import kotlinx.coroutines.CoroutineDispatcher; import kotlinx.coroutines.flow.Flow; +import kotlinx.coroutines.flow.MutableStateFlow; import kotlinx.coroutines.flow.StateFlow; import java.io.PrintWriter; @@ -214,7 +218,8 @@ import javax.inject.Inject; import javax.inject.Provider; @SysUISingleton -public final class NotificationPanelViewController implements ShadeSurface, Dumpable { +public final class NotificationPanelViewController implements + ShadeSurface, Dumpable, BrightnessMirrorShowingInteractor { public static final String TAG = NotificationPanelView.class.getSimpleName(); private static final boolean DEBUG_LOGCAT = Compile.IS_DEBUG && Log.isLoggable(TAG, Log.DEBUG); @@ -403,6 +408,18 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mTrackingHeadsUpListeners = new ArrayList<>(); private HeadsUpAppearanceController mHeadsUpAppearanceController; + private final BrightnessMirrorShowingRepository mBrightnessMirrorShowingRepository; + /** + * This flow would track whether the brightness mirror should be showing, but aware of the + * alpha transitions of NPV. + * + * When the repository flow emits true, this will also emit true (and start the alpha animation + * of NPV to go to 0f). However, when the repository emits false, this will first animate the + * alpha to 1f, and then emit false. This guarantees that the mirror is always showing while + * the alpha of NPV is animating. + */ + private final MutableStateFlow<Boolean> mIsBrightnessMirrorShowing = MutableStateFlow(false); + private int mPanelAlpha; private Runnable mPanelAlphaEndAction; private final AnimatableProperty mPanelAlphaAnimator = AnimatableProperty.from("panelAlpha", @@ -420,6 +437,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump if (mPanelAlphaEndAction != null) { mPanelAlphaEndAction.run(); } + // Once the animation for the alpha has finished (NPV is visible again), dismiss + // the mirror + postToView(() -> mIsBrightnessMirrorShowing.setValue(false)); }).setCustomInterpolator( mPanelAlphaAnimator.getProperty(), Interpolators.ALPHA_IN); @@ -530,7 +550,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump }; private final ActivityStarter mActivityStarter; - private final BrightnessMirrorShowingInteractor mBrightnessMirrorShowingInteractor; @Nullable private RenderEffect mBlurRenderEffect = null; @@ -608,7 +627,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump PowerInteractor powerInteractor, KeyguardClockPositionAlgorithm keyguardClockPositionAlgorithm, MSDLPlayer msdlPlayer, - BrightnessMirrorShowingInteractor brightnessMirrorShowingInteractor, + BrightnessMirrorShowingRepository brightnessMirrorShowingRepository, BlurConfig blurConfig) { mBlurConfig = blurConfig; SceneContainerFlag.assertInLegacyMode(); @@ -765,7 +784,10 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump }, mFalsingManager); mActivityStarter = activityStarter; - mBrightnessMirrorShowingInteractor = brightnessMirrorShowingInteractor; + mBrightnessMirrorShowingRepository = brightnessMirrorShowingRepository; + mIsBrightnessMirrorShowing.setValue( + mBrightnessMirrorShowingRepository.isShowing().getValue() + ); onFinishInflate(); keyguardUnlockAnimationController.addKeyguardUnlockAnimationListener( new KeyguardUnlockAnimationController.KeyguardUnlockAnimationListener() { @@ -893,12 +915,32 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump mMainDispatcher); if (QSComposeFragment.isEnabled()) { collectFlow(mView, - mBrightnessMirrorShowingInteractor.isShowing(), - isShowing -> setAlpha(isShowing ? 0 : 255, true) + mBrightnessMirrorShowingRepository.isShowing(), + this::onBrightnessMirrorShowingChanged ); } } + private void onBrightnessMirrorShowingChanged(boolean isShowing) { + if (!mIsBrightnessMirrorShowing.getValue()) { + // Immediately set the value of the mirror if we are not showing the mirror, and then + // start fading the shade. + mIsBrightnessMirrorShowing.setValue(isShowing); + } + setAlpha(isShowing ? 0 : 255, true); + } + + @androidx.annotation.NonNull + @Override + public StateFlow<Boolean> isShowing() { + return mIsBrightnessMirrorShowing; + } + + @Override + public void setMirrorShowing(boolean showing) { + mBrightnessMirrorShowingRepository.setMirrorShowing(showing); + } + @VisibleForTesting void loadDimens() { final ViewConfiguration configuration = ViewConfiguration.get(this.mView.getContext()); diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeEmptyImplModule.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeEmptyImplModule.kt index 99ff94605c39..631f2ed502ab 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeEmptyImplModule.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeEmptyImplModule.kt @@ -17,6 +17,8 @@ package com.android.systemui.shade import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractor +import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractorPassThrough import com.android.systemui.shade.data.repository.PrivacyChipRepository import com.android.systemui.shade.data.repository.PrivacyChipRepositoryImpl import com.android.systemui.shade.data.repository.ShadeRepository @@ -81,4 +83,10 @@ abstract class ShadeEmptyImplModule { @Binds @SysUISingleton abstract fun bindShadeModeInteractor(impl: ShadeModeInteractorEmptyImpl): ShadeModeInteractor + + @Binds + @SysUISingleton + abstract fun bindBrightnessMirrorInteractor( + impl: BrightnessMirrorShowingInteractorPassThrough + ): BrightnessMirrorShowingInteractor } diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt index c44e066aad3a..f7b998ebbf43 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeModule.kt @@ -22,6 +22,8 @@ import com.android.systemui.log.LogBufferFactory import com.android.systemui.plugins.qs.QSContainerController import com.android.systemui.qs.ui.adapter.QSSceneAdapterImpl import com.android.systemui.scene.shared.flag.SceneContainerFlag +import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractor +import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractorPassThrough import com.android.systemui.shade.carrier.ShadeCarrierGroupControllerLog import com.android.systemui.shade.data.repository.PrivacyChipRepository import com.android.systemui.shade.data.repository.PrivacyChipRepositoryImpl @@ -156,6 +158,19 @@ abstract class ShadeModule { @Provides @SysUISingleton + fun providesBrightnessMirrorInteractor( + sceneContainerOn: Provider<BrightnessMirrorShowingInteractorPassThrough>, + sceneContainerOff: Provider<NotificationPanelViewController>, + ): BrightnessMirrorShowingInteractor { + return if (SceneContainerFlag.isEnabled) { + sceneContainerOn.get() + } else { + sceneContainerOff.get() + } + } + + @Provides + @SysUISingleton fun providesQSContainerController(impl: QSSceneAdapterImpl): QSContainerController { return impl } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index a9b3753b42cb..face1c7512ce 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -163,7 +163,7 @@ import com.android.systemui.scene.shared.flag.SceneContainerFlag; import com.android.systemui.scrim.ScrimView; import com.android.systemui.settings.UserTracker; import com.android.systemui.settings.brightness.BrightnessSliderController; -import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractor; +import com.android.systemui.settings.brightness.data.repository.BrightnessMirrorShowingRepository; import com.android.systemui.shade.CameraLauncher; import com.android.systemui.shade.GlanceableHubContainerController; import com.android.systemui.shade.NotificationShadeWindowView; @@ -589,7 +589,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { private final ColorExtractor.OnColorsChangedListener mOnColorsChangedListener = (extractor, which) -> updateTheme(); - private final BrightnessMirrorShowingInteractor mBrightnessMirrorShowingInteractor; + private final BrightnessMirrorShowingRepository mBrightnessMirrorShowingRepository; // Only use before the scene container. Null if scene container is enabled. @Nullable private final GlanceableHubContainerController mGlanceableHubContainerController; @@ -709,7 +709,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { AlternateBouncerInteractor alternateBouncerInteractor, UserTracker userTracker, ActivityStarter activityStarter, - BrightnessMirrorShowingInteractor brightnessMirrorShowingInteractor, + BrightnessMirrorShowingRepository brightnessMirrorShowingRepository, GlanceableHubContainerController glanceableHubContainerController, EmergencyGestureIntentFactory emergencyGestureIntentFactory, ViewCaptureAwareWindowManager viewCaptureAwareWindowManager, @@ -805,7 +805,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mAlternateBouncerInteractor = alternateBouncerInteractor; mUserTracker = userTracker; mActivityStarter = activityStarter; - mBrightnessMirrorShowingInteractor = brightnessMirrorShowingInteractor; + mBrightnessMirrorShowingRepository = brightnessMirrorShowingRepository; if (!SceneContainerFlag.isEnabled()) { mGlanceableHubContainerController = glanceableHubContainerController; } else { @@ -1110,7 +1110,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mIdleOnCommunalConsumer); if (SceneContainerFlag.isEnabled() || QSComposeFragment.isEnabled()) { mJavaAdapter.alwaysCollectFlow( - mBrightnessMirrorShowingInteractor.isShowing(), + mBrightnessMirrorShowingRepository.isShowing(), this::setBrightnessMirrorShowing ); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt index 856ece7e7ff3..e42bf19663a5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt @@ -55,7 +55,7 @@ import com.android.systemui.kosmos.testScope import com.android.systemui.qs.flags.QSComposeFragment 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 @@ -168,7 +168,7 @@ class NotificationShadeWindowViewControllerTest(flags: FlagsParameterization) : private val brightnessMirrorShowingRepository = BrightnessMirrorShowingRepository() private val brightnessMirrorShowingInteractor = - BrightnessMirrorShowingInteractor(brightnessMirrorShowingRepository) + BrightnessMirrorShowingInteractorPassThrough(brightnessMirrorShowingRepository) private lateinit var falsingCollector: FalsingCollectorFake private lateinit var fakeClock: FakeSystemClock diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java index 7d3aa47e124d..89b7bee7f286 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java @@ -144,7 +144,7 @@ import com.android.systemui.scene.domain.startable.ScrimStartable; import com.android.systemui.scene.shared.flag.SceneContainerFlag; import com.android.systemui.settings.UserTracker; import com.android.systemui.settings.brightness.BrightnessSliderController; -import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirrorShowingInteractor; +import com.android.systemui.settings.brightness.data.repository.BrightnessMirrorShowingRepository; import com.android.systemui.shade.CameraLauncher; import com.android.systemui.shade.GlanceableHubContainerController; import com.android.systemui.shade.NotificationPanelView; @@ -388,8 +388,8 @@ public class CentralSurfacesImplTest extends SysuiTestCase { private final ScreenLifecycle mScreenLifecycle = new ScreenLifecycle(mDumpManager); private MessageRouterImpl mMessageRouter = new MessageRouterImpl(mMainExecutor); - private final BrightnessMirrorShowingInteractor mBrightnessMirrorShowingInteractor = - mKosmos.getBrightnessMirrorShowingInteractor(); + private final BrightnessMirrorShowingRepository mBrightnessMirrorShowingRepository = + mKosmos.getBrightnessMirrorShowingRepository(); private final StatusBarModePerDisplayRepository mStatusBarModePerDisplayRepository = mKosmos.getStatusBarModePerDisplayRepository(); @@ -639,7 +639,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { mAlternateBouncerInteractor, mUserTracker, mActivityStarter, - mBrightnessMirrorShowingInteractor, + mBrightnessMirrorShowingRepository, mGlanceableHubContainerController, mEmergencyGestureIntentFactory, mViewCaptureAwareWindowManager, @@ -1146,11 +1146,11 @@ public class CentralSurfacesImplTest extends SysuiTestCase { final ScrimStartable scrimStartable = mKosmos.getScrimStartable(); scrimStartable.start(); - mBrightnessMirrorShowingInteractor.setMirrorShowing(true); + mBrightnessMirrorShowingRepository.setMirrorShowing(true); mTestScope.getTestScheduler().runCurrent(); verify(mScrimController, atLeastOnce()).transitionTo(ScrimState.BRIGHTNESS_MIRROR); - mBrightnessMirrorShowingInteractor.setMirrorShowing(false); + mBrightnessMirrorShowingRepository.setMirrorShowing(false); mTestScope.getTestScheduler().runCurrent(); ArgumentCaptor<ScrimState> captor = ArgumentCaptor.forClass(ScrimState.class); // The default is to call the one with the callback argument @@ -1162,12 +1162,12 @@ public class CentralSurfacesImplTest extends SysuiTestCase { @DisableSceneContainer @EnableFlags(QSComposeFragment.FLAG_NAME) public void brightnesShowingChanged_qsUiRefactorFlagEnabled_ScrimControllerNotified() { - mBrightnessMirrorShowingInteractor.setMirrorShowing(true); + mBrightnessMirrorShowingRepository.setMirrorShowing(true); mTestScope.getTestScheduler().runCurrent(); verify(mScrimController, atLeastOnce()).legacyTransitionTo(ScrimState.BRIGHTNESS_MIRROR); clearInvocations(mScrimController); - mBrightnessMirrorShowingInteractor.setMirrorShowing(false); + mBrightnessMirrorShowingRepository.setMirrorShowing(false); mTestScope.getTestScheduler().runCurrent(); ArgumentCaptor<ScrimState> captor = ArgumentCaptor.forClass(ScrimState.class); // The default is to call the one with the callback argument @@ -1179,7 +1179,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { @DisableSceneContainer @DisableFlags(QSComposeFragment.FLAG_NAME) public void brightnesShowingChanged_flagsDisabled_ScrimControllerNotified() { - mBrightnessMirrorShowingInteractor.setMirrorShowing(true); + mBrightnessMirrorShowingRepository.setMirrorShowing(true); mTestScope.getTestScheduler().runCurrent(); verify(mScrimController, never()).legacyTransitionTo(ScrimState.BRIGHTNESS_MIRROR); verify(mScrimController, never()) diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt index 60b371aa8afb..02cf1f5a7214 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt @@ -62,7 +62,7 @@ import com.android.systemui.scene.domain.startable.scrimStartable import com.android.systemui.scene.sceneContainerConfig import com.android.systemui.scene.shared.model.sceneDataSource import com.android.systemui.scene.ui.view.mockWindowRootViewProvider -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.shadeRepository import com.android.systemui.shade.domain.interactor.shadeInteractor import com.android.systemui.shade.domain.interactor.shadeLayoutParams @@ -162,7 +162,7 @@ class KosmosJavaAdapter() { val sharedNotificationContainerInteractor by lazy { kosmos.sharedNotificationContainerInteractor } - val brightnessMirrorShowingInteractor by lazy { kosmos.brightnessMirrorShowingInteractor } + val brightnessMirrorShowingRepository by lazy { kosmos.brightnessMirrorShowingRepository } val qsLongPressEffect by lazy { kosmos.qsLongPressEffect } val shadeController by lazy { kosmos.shadeController } val shadeRepository by lazy { kosmos.shadeRepository } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/settings/brightness/domain/interactor/BrightnessMirrorShowingInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/settings/brightness/domain/interactor/BrightnessMirrorShowingInteractorKosmos.kt index 8f6b829f0021..d4bed1633d80 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/settings/brightness/domain/interactor/BrightnessMirrorShowingInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/settings/brightness/domain/interactor/BrightnessMirrorShowingInteractorKosmos.kt @@ -20,4 +20,6 @@ import com.android.systemui.kosmos.Kosmos import com.android.systemui.settings.brightness.data.repository.brightnessMirrorShowingRepository val Kosmos.brightnessMirrorShowingInteractor by - Kosmos.Fixture { BrightnessMirrorShowingInteractor(brightnessMirrorShowingRepository) } + Kosmos.Fixture { + BrightnessMirrorShowingInteractorPassThrough(brightnessMirrorShowingRepository) + } |