diff options
10 files changed, 63 insertions, 67 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/FakeCollapsedStatusBarViewBinder.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/FakeHomeStatusBarViewBinder.kt index 2ee928fa6d17..cdc7aa2dea2a 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/FakeCollapsedStatusBarViewBinder.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/FakeHomeStatusBarViewBinder.kt @@ -17,21 +17,21 @@ package com.android.systemui.statusbar.pipeline.shared.ui.viewmodel import android.view.View -import com.android.systemui.statusbar.pipeline.shared.ui.binder.CollapsedStatusBarViewBinder +import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarViewBinder import com.android.systemui.statusbar.pipeline.shared.ui.binder.StatusBarVisibilityChangeListener /** * A fake view binder that can be used from Java tests. * * Since Java tests can't run tests within test scopes, we need to bypass the flows from - * [CollapsedStatusBarViewModel] and just trigger the listener directly. + * [HomeStatusBarViewModel] and just trigger the listener directly. */ -class FakeCollapsedStatusBarViewBinder : CollapsedStatusBarViewBinder { +class FakeHomeStatusBarViewBinder : HomeStatusBarViewBinder { var listener: StatusBarVisibilityChangeListener? = null override fun bind( view: View, - viewModel: CollapsedStatusBarViewModel, + viewModel: HomeStatusBarViewModel, listener: StatusBarVisibilityChangeListener, ) { this.listener = listener diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/FakeCollapsedStatusBarViewModel.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/FakeHomeStatusBarViewModel.kt index cc90c1167ef1..02c1540d3d8b 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/FakeCollapsedStatusBarViewModel.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/FakeHomeStatusBarViewModel.kt @@ -23,7 +23,7 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow -class FakeCollapsedStatusBarViewModel : CollapsedStatusBarViewModel { +class FakeHomeStatusBarViewModel : HomeStatusBarViewModel { private val areNotificationLightsOut = MutableStateFlow(false) override val isTransitioningFromLockscreenToOccluded = MutableStateFlow(false) @@ -39,7 +39,7 @@ class FakeCollapsedStatusBarViewModel : CollapsedStatusBarViewModel { override val isClockVisible = MutableStateFlow( - CollapsedStatusBarViewModel.VisibilityModel( + HomeStatusBarViewModel.VisibilityModel( visibility = View.GONE, shouldAnimateChange = false, ) @@ -47,7 +47,7 @@ class FakeCollapsedStatusBarViewModel : CollapsedStatusBarViewModel { override val isNotificationIconContainerVisible = MutableStateFlow( - CollapsedStatusBarViewModel.VisibilityModel( + HomeStatusBarViewModel.VisibilityModel( visibility = View.GONE, shouldAnimateChange = false, ) @@ -55,7 +55,7 @@ class FakeCollapsedStatusBarViewModel : CollapsedStatusBarViewModel { override val isSystemInfoVisible = MutableStateFlow( - CollapsedStatusBarViewModel.VisibilityModel( + HomeStatusBarViewModel.VisibilityModel( visibility = View.GONE, shouldAnimateChange = false, ) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/CollapsedStatusBarViewModelImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModelImplTest.kt index bd857807851c..e587ad7a41d7 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/CollapsedStatusBarViewModelImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModelImplTest.kt @@ -75,7 +75,7 @@ import org.junit.runner.RunWith @SmallTest @OptIn(ExperimentalCoroutinesApi::class) @RunWith(AndroidJUnit4::class) -class CollapsedStatusBarViewModelImplTest : SysuiTestCase() { +class HomeStatusBarViewModelImplTest : SysuiTestCase() { private val kosmos = Kosmos().also { it.testCase = this @@ -89,13 +89,13 @@ class CollapsedStatusBarViewModelImplTest : SysuiTestCase() { private val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository private val disableFlagsRepository = kosmos.fakeDisableFlagsRepository - private lateinit var underTest: CollapsedStatusBarViewModel + private lateinit var underTest: HomeStatusBarViewModel @Before fun setUp() { setUpPackageManagerForMediaProjection(kosmos) // Initialize here because some flags are checked when this class is constructed - underTest = kosmos.collapsedStatusBarViewModel + underTest = kosmos.homeStatusBarViewModel } @Test diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java index d5e82650bdee..37c8c637c804 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java @@ -72,9 +72,9 @@ import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallListener; import com.android.systemui.statusbar.phone.ui.DarkIconManager; import com.android.systemui.statusbar.phone.ui.StatusBarIconController; -import com.android.systemui.statusbar.pipeline.shared.ui.binder.CollapsedStatusBarViewBinder; +import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarViewBinder; import com.android.systemui.statusbar.pipeline.shared.ui.binder.StatusBarVisibilityChangeListener; -import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.CollapsedStatusBarViewModel; +import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.window.StatusBarWindowStateController; import com.android.systemui.statusbar.window.StatusBarWindowStateListener; @@ -143,8 +143,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue private final ShadeExpansionStateManager mShadeExpansionStateManager; private final StatusBarIconController mStatusBarIconController; private final CarrierConfigTracker mCarrierConfigTracker; - private final CollapsedStatusBarViewModel mCollapsedStatusBarViewModel; - private final CollapsedStatusBarViewBinder mCollapsedStatusBarViewBinder; + private final HomeStatusBarViewModel mHomeStatusBarViewModel; + private final HomeStatusBarViewBinder mHomeStatusBarViewBinder; private final StatusBarHideIconsForBouncerManager mStatusBarHideIconsForBouncerManager; private final DarkIconManager.Factory mDarkIconManagerFactory; private final SecureSettings mSecureSettings; @@ -245,8 +245,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue ShadeExpansionStateManager shadeExpansionStateManager, StatusBarIconController statusBarIconController, DarkIconManager.Factory darkIconManagerFactory, - CollapsedStatusBarViewModel collapsedStatusBarViewModel, - CollapsedStatusBarViewBinder collapsedStatusBarViewBinder, + HomeStatusBarViewModel homeStatusBarViewModel, + HomeStatusBarViewBinder homeStatusBarViewBinder, StatusBarHideIconsForBouncerManager statusBarHideIconsForBouncerManager, KeyguardStateController keyguardStateController, PanelExpansionInteractor panelExpansionInteractor, @@ -267,8 +267,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue mAnimationScheduler = animationScheduler; mShadeExpansionStateManager = shadeExpansionStateManager; mStatusBarIconController = statusBarIconController; - mCollapsedStatusBarViewModel = collapsedStatusBarViewModel; - mCollapsedStatusBarViewBinder = collapsedStatusBarViewBinder; + mHomeStatusBarViewModel = homeStatusBarViewModel; + mHomeStatusBarViewBinder = homeStatusBarViewBinder; mStatusBarHideIconsForBouncerManager = statusBarHideIconsForBouncerManager; mDarkIconManagerFactory = darkIconManagerFactory; mKeyguardStateController = keyguardStateController; @@ -371,8 +371,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue mCarrierConfigTracker.addCallback(mCarrierConfigCallback); mCarrierConfigTracker.addDefaultDataSubscriptionChangedListener(mDefaultDataListener); - mCollapsedStatusBarViewBinder.bind( - mStatusBar, mCollapsedStatusBarViewModel, mStatusBarVisibilityChangeListener); + mHomeStatusBarViewBinder.bind( + mStatusBar, mHomeStatusBarViewModel, mStatusBarVisibilityChangeListener); } private String getDumpableName() { @@ -757,7 +757,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue // transition to occluding to finish before allowing us to potentially show the status bar // again. (This status bar is always hidden on keyguard, so it's safe to continue hiding it // during this transition.) See b/273314977. - if (mCollapsedStatusBarViewModel.isTransitioningFromLockscreenToOccluded().getValue()) { + if (mHomeStatusBarViewModel.isTransitioningFromLockscreenToOccluded().getValue()) { return true; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt index 48500499f537..935b1012be31 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt @@ -48,10 +48,10 @@ import com.android.systemui.statusbar.pipeline.satellite.ui.viewmodel.DeviceBase import com.android.systemui.statusbar.pipeline.satellite.ui.viewmodel.DeviceBasedSatelliteViewModelImpl import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepositoryImpl -import com.android.systemui.statusbar.pipeline.shared.ui.binder.CollapsedStatusBarViewBinder -import com.android.systemui.statusbar.pipeline.shared.ui.binder.CollapsedStatusBarViewBinderImpl -import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.CollapsedStatusBarViewModel -import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.CollapsedStatusBarViewModelImpl +import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarViewBinder +import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarViewBinderImpl +import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel +import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModelImpl import com.android.systemui.statusbar.pipeline.wifi.data.repository.RealWifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepositorySwitcher @@ -131,14 +131,10 @@ abstract class StatusBarPipelineModule { abstract fun bindCarrierConfigStartable(impl: CarrierConfigCoreStartable): CoreStartable @Binds - abstract fun collapsedStatusBarViewModel( - impl: CollapsedStatusBarViewModelImpl - ): CollapsedStatusBarViewModel + abstract fun homeStatusBarViewModel(impl: HomeStatusBarViewModelImpl): HomeStatusBarViewModel @Binds - abstract fun collapsedStatusBarViewBinder( - impl: CollapsedStatusBarViewBinderImpl - ): CollapsedStatusBarViewBinder + abstract fun homeStatusBarViewBinder(impl: HomeStatusBarViewBinderImpl): HomeStatusBarViewBinder companion object { @@ -162,7 +158,7 @@ abstract class StatusBarPipelineModule { @SysUISingleton @Named(FIRST_MOBILE_SUB_SHOWING_NETWORK_TYPE_ICON) fun provideFirstMobileSubShowingNetworkTypeIconProvider( - mobileIconsViewModel: MobileIconsViewModel, + mobileIconsViewModel: MobileIconsViewModel ): Supplier<Flow<Boolean>> { return Supplier<Flow<Boolean>> { mobileIconsViewModel.firstMobileSubShowingNetworkTypeIcon diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/CollapsedStatusBarViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/HomeStatusBarViewBinder.kt index 3a07d9b6beaf..8d7b57db4125 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/CollapsedStatusBarViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/HomeStatusBarViewBinder.kt @@ -33,31 +33,32 @@ import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel import com.android.systemui.statusbar.core.StatusBarSimpleFragment import com.android.systemui.statusbar.notification.shared.NotificationsLiveDataStoreRefactor import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment -import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.CollapsedStatusBarViewModel +import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel +import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel.VisibilityModel import javax.inject.Inject import kotlinx.coroutines.launch /** - * Interface to assist with binding the [CollapsedStatusBarFragment] to - * [CollapsedStatusBarViewModel]. Used only to enable easy testing of [CollapsedStatusBarFragment]. + * Interface to assist with binding the [CollapsedStatusBarFragment] to [HomeStatusBarViewModel]. + * Used only to enable easy testing of [CollapsedStatusBarFragment]. */ -interface CollapsedStatusBarViewBinder { +interface HomeStatusBarViewBinder { /** * Binds the view to the view-model. [listener] will be notified whenever an event that may * change the status bar visibility occurs. */ fun bind( view: View, - viewModel: CollapsedStatusBarViewModel, + viewModel: HomeStatusBarViewModel, listener: StatusBarVisibilityChangeListener, ) } @SysUISingleton -class CollapsedStatusBarViewBinderImpl @Inject constructor() : CollapsedStatusBarViewBinder { +class HomeStatusBarViewBinderImpl @Inject constructor() : HomeStatusBarViewBinder { override fun bind( view: View, - viewModel: CollapsedStatusBarViewModel, + viewModel: HomeStatusBarViewModel, listener: StatusBarVisibilityChangeListener, ) { view.repeatWhenAttached { @@ -185,9 +186,8 @@ class CollapsedStatusBarViewBinderImpl @Inject constructor() : CollapsedStatusBa } } - private fun OngoingActivityChipModel.toVisibilityModel(): - CollapsedStatusBarViewModel.VisibilityModel { - return CollapsedStatusBarViewModel.VisibilityModel( + private fun OngoingActivityChipModel.toVisibilityModel(): VisibilityModel { + return VisibilityModel( visibility = if (this is OngoingActivityChipModel.Shown) View.VISIBLE else View.GONE, // TODO(b/364653005): Figure out the animation story here. shouldAnimateChange = true, @@ -224,7 +224,7 @@ class CollapsedStatusBarViewBinderImpl @Inject constructor() : CollapsedStatusBa .start() } - private fun View.adjustVisibility(model: CollapsedStatusBarViewModel.VisibilityModel) { + private fun View.adjustVisibility(model: VisibilityModel) { if (model.visibility == View.VISIBLE) { this.show(model.shouldAnimateChange) } else { @@ -298,7 +298,7 @@ interface StatusBarVisibilityChangeListener { /** * Called when the scene state has changed such that the home status bar is newly allowed or no - * longer allowed. See [CollapsedStatusBarViewModel.isHomeStatusBarAllowedByScene]. + * longer allowed. See [HomeStatusBarViewModel.isHomeStatusBarAllowedByScene]. */ fun onIsHomeStatusBarAllowedBySceneChanged(isHomeStatusBarAllowedByScene: Boolean) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt index 287dd3946bdf..440eb91841ee 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt @@ -40,9 +40,9 @@ import com.android.systemui.statusbar.phone.StatusIconContainer import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController import com.android.systemui.statusbar.phone.ui.DarkIconManager import com.android.systemui.statusbar.phone.ui.StatusBarIconController -import com.android.systemui.statusbar.pipeline.shared.ui.binder.CollapsedStatusBarViewBinder +import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarViewBinder import com.android.systemui.statusbar.pipeline.shared.ui.binder.StatusBarVisibilityChangeListener -import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.CollapsedStatusBarViewModel +import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel import javax.inject.Inject import kotlinx.coroutines.launch @@ -51,8 +51,8 @@ class StatusBarRootFactory @Inject constructor( private val context: Context, - private val collapsedStatusBarViewModel: CollapsedStatusBarViewModel, - private val collapsedStatusBarViewBinder: CollapsedStatusBarViewBinder, + private val homeStatusBarViewModel: HomeStatusBarViewModel, + private val homeStatusBarViewBinder: HomeStatusBarViewBinder, private val notificationIconsBinder: NotificationIconContainerStatusBarViewBinder, private val darkIconManagerFactory: DarkIconManager.Factory, private val iconController: StatusBarIconController, @@ -64,8 +64,8 @@ constructor( setContent { StatusBarRoot( parent = root, - statusBarViewModel = collapsedStatusBarViewModel, - statusBarViewBinder = collapsedStatusBarViewBinder, + statusBarViewModel = homeStatusBarViewModel, + statusBarViewBinder = homeStatusBarViewBinder, notificationIconsBinder = notificationIconsBinder, darkIconManagerFactory = darkIconManagerFactory, iconController = iconController, @@ -92,8 +92,8 @@ constructor( @Composable fun StatusBarRoot( parent: ViewGroup, - statusBarViewModel: CollapsedStatusBarViewModel, - statusBarViewBinder: CollapsedStatusBarViewBinder, + statusBarViewModel: HomeStatusBarViewModel, + statusBarViewBinder: HomeStatusBarViewBinder, notificationIconsBinder: NotificationIconContainerStatusBarViewBinder, darkIconManagerFactory: DarkIconManager.Factory, iconController: StatusBarIconController, @@ -178,11 +178,11 @@ fun StatusBarRoot( * This is our analog of the flexi "ribbon", which just shows some text so we know if the flag is on */ @Composable -fun Disambiguation(viewModel: CollapsedStatusBarViewModel) { +fun Disambiguation(viewModel: HomeStatusBarViewModel) { val clockVisibilityModel = viewModel.isClockVisible.collectAsStateWithLifecycle( initialValue = - CollapsedStatusBarViewModel.VisibilityModel( + HomeStatusBarViewModel.VisibilityModel( visibility = View.GONE, shouldAnimateChange = false, ) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/CollapsedStatusBarViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModel.kt index 366ea3516965..9bcc2429c5e2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/CollapsedStatusBarViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModel.kt @@ -38,7 +38,7 @@ import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotif import com.android.systemui.statusbar.notification.shared.NotificationsLiveDataStoreRefactor import com.android.systemui.statusbar.phone.domain.interactor.LightsOutInteractor import com.android.systemui.statusbar.pipeline.shared.domain.interactor.CollapsedStatusBarInteractor -import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.CollapsedStatusBarViewModel.VisibilityModel +import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel.VisibilityModel import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow @@ -61,7 +61,7 @@ import kotlinx.coroutines.flow.stateIn * [StatusBarHideIconsForBouncerManager]. We should move those pieces of logic to this class instead * so that it's all in one place and easily testable outside of the fragment. */ -interface CollapsedStatusBarViewModel { +interface HomeStatusBarViewModel { /** * True if the device is currently transitioning from lockscreen to occluded and false * otherwise. @@ -116,7 +116,7 @@ interface CollapsedStatusBarViewModel { } @SysUISingleton -class CollapsedStatusBarViewModelImpl +class HomeStatusBarViewModelImpl @Inject constructor( collapsedStatusBarInteractor: CollapsedStatusBarInteractor, @@ -128,7 +128,7 @@ constructor( shadeInteractor: ShadeInteractor, ongoingActivityChipsViewModel: OngoingActivityChipsViewModel, @Application coroutineScope: CoroutineScope, -) : CollapsedStatusBarViewModel { +) : HomeStatusBarViewModel { override val isTransitioningFromLockscreenToOccluded: StateFlow<Boolean> = keyguardTransitionInteractor .isInTransition(Edge.create(from = LOCKSCREEN, to = OCCLUDED)) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java index 80325c0ff6b9..d01c1ca36c4e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java @@ -70,8 +70,8 @@ import com.android.systemui.statusbar.phone.fragment.dagger.HomeStatusBarCompone import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController; import com.android.systemui.statusbar.phone.ui.DarkIconManager; import com.android.systemui.statusbar.phone.ui.StatusBarIconController; -import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.FakeCollapsedStatusBarViewBinder; -import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.FakeCollapsedStatusBarViewModel; +import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.FakeHomeStatusBarViewBinder; +import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.FakeHomeStatusBarViewModel; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.window.StatusBarWindowStateController; import com.android.systemui.statusbar.window.StatusBarWindowStateListener; @@ -122,8 +122,8 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { private DarkIconManager.Factory mIconManagerFactory; @Mock private DarkIconManager mIconManager; - private FakeCollapsedStatusBarViewModel mCollapsedStatusBarViewModel; - private FakeCollapsedStatusBarViewBinder mCollapsedStatusBarViewBinder; + private FakeHomeStatusBarViewModel mCollapsedStatusBarViewModel; + private FakeHomeStatusBarViewBinder mCollapsedStatusBarViewBinder; @Mock private StatusBarHideIconsForBouncerManager mStatusBarHideIconsForBouncerManager; @Mock @@ -1190,8 +1190,8 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { mSecureSettings = mock(SecureSettings.class); mShadeExpansionStateManager = new ShadeExpansionStateManager(); - mCollapsedStatusBarViewModel = new FakeCollapsedStatusBarViewModel(); - mCollapsedStatusBarViewBinder = new FakeCollapsedStatusBarViewBinder(); + mCollapsedStatusBarViewModel = new FakeHomeStatusBarViewModel(); + mCollapsedStatusBarViewBinder = new FakeHomeStatusBarViewBinder(); return new CollapsedStatusBarFragment( mStatusBarFragmentComponentFactory, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/CollapsedStatusBarViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/CollapsedStatusBarViewModelKosmos.kt index 1c7fd4817498..81ced6cd54cb 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/CollapsedStatusBarViewModelKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/CollapsedStatusBarViewModelKosmos.kt @@ -27,9 +27,9 @@ import com.android.systemui.statusbar.notification.domain.interactor.activeNotif import com.android.systemui.statusbar.phone.domain.interactor.lightsOutInteractor import com.android.systemui.statusbar.pipeline.shared.domain.interactor.collapsedStatusBarInteractor -val Kosmos.collapsedStatusBarViewModel: CollapsedStatusBarViewModel by +val Kosmos.homeStatusBarViewModel: HomeStatusBarViewModel by Kosmos.Fixture { - CollapsedStatusBarViewModelImpl( + HomeStatusBarViewModelImpl( collapsedStatusBarInteractor, lightsOutInteractor, activeNotificationsInteractor, |