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

Commit 13f7e97f authored by Evan Laird's avatar Evan Laird
Browse files

[sb] s/Collapsed/Home/ on the view binder and model 

Following up from the previous commit, this just renames the view binder
and view model for HomeStatusBar to better match their intent.
"Collapsed" doesn't mean anything anymore, since the notification window
is not the same window as the status bar.

Test: build
Test: atest SystemUITests
Flag: EXEMPT renaming via IDE
Bug: 364360986
Change-Id: Ib8251e7b183df97c77162c96a969b733d4d6ea2c
parent 30a8feff

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/FakeCollapsedStatusBarViewBinder.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/FakeHomeStatusBarViewBinder.kt

+4 −4
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/FakeCollapsedStatusBarViewModel.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/FakeHomeStatusBarViewModel.kt

+4 −4
Original line number Diff line number Diff line
@@ -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,

            )

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/CollapsedStatusBarViewModelImplTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModelImplTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java

+11 −11
Original line number Diff line number Diff line
@@ -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;

        }

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt

+7 −11
Original line number Diff line number Diff line
@@ -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