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

Commit 0b147716 authored by Evan Laird's avatar Evan Laird
Browse files

[sb] s/Collapsed/Home/ for statusbar interactor 

Bug: 364360986
Test: EXEMPT rename
Flag: EXEMPT rename
Change-Id: I00ca53cd8645b790c228252370815e3882a64311
parent 48309d47

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/domain/interactor/CollapsedStatusBarInteractorTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/shared/domain/interactor/HomeStatusBarInteractorTest.kt

+2 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.telephony.CarrierConfigManager 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.kosmos.collectLastValue

import com.android.systemui.kosmos.runTest

import com.android.systemui.kosmos.testScope
@@ -43,17 +42,16 @@ import com.android.systemui.statusbar.pipeline.shared.fake 
import com.android.systemui.testKosmos

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

import kotlin.test.Test

import kotlinx.coroutines.test.runTest

import org.junit.runner.RunWith



@SmallTest

@RunWith(AndroidJUnit4::class)

class CollapsedStatusBarInteractorTest : SysuiTestCase() {

class HomeStatusBarInteractorTest : SysuiTestCase() {

    val kosmos = testKosmos()

    val testScope = kosmos.testScope

    val disableFlagsRepo = kosmos.fakeDisableFlagsRepository



    val underTest = kosmos.collapsedStatusBarInteractor

    val underTest = kosmos.homeStatusBarInteractor



    @Test

    fun visibilityViaDisableFlags_allDisabled() =

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

+5 −5
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ import com.android.systemui.statusbar.notification.shared.NotificationsLiveDataS 
import com.android.systemui.statusbar.notification.stack.data.repository.headsUpNotificationRepository

import com.android.systemui.statusbar.phone.SysuiDarkIconDispatcher

import com.android.systemui.statusbar.phone.data.repository.fakeDarkIconRepository

import com.android.systemui.statusbar.pipeline.shared.domain.interactor.setCollapsedStatusBarInteractorShowOperatorName

import com.android.systemui.statusbar.pipeline.shared.domain.interactor.setHomeStatusBarInteractorShowOperatorName

import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel.VisibilityModel

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat
@@ -503,7 +503,7 @@ class HomeStatusBarViewModelImplTest : SysuiTestCase() { 
    @Test

    fun shouldShowOperatorNameView_allowedByInteractor_allowedByDisableFlags_visible() =

        kosmos.runTest {

            kosmos.setCollapsedStatusBarInteractorShowOperatorName(true)

            kosmos.setHomeStatusBarInteractorShowOperatorName(true)



            val latest by collectLastValue(underTest.shouldShowOperatorNameView)

            transitionKeyguardToGone()
@@ -517,7 +517,7 @@ class HomeStatusBarViewModelImplTest : SysuiTestCase() { 
    @Test

    fun shouldShowOperatorNameView_disAllowedByInteractor_allowedByDisableFlags_notVisible() =

        kosmos.runTest {

            kosmos.setCollapsedStatusBarInteractorShowOperatorName(false)

            kosmos.setHomeStatusBarInteractorShowOperatorName(false)



            transitionKeyguardToGone()
@@ -532,7 +532,7 @@ class HomeStatusBarViewModelImplTest : SysuiTestCase() { 
    @Test

    fun shouldShowOperatorNameView_allowedByInteractor_disallowedByDisableFlags_notVisible() =

        kosmos.runTest {

            kosmos.setCollapsedStatusBarInteractorShowOperatorName(true)

            kosmos.setHomeStatusBarInteractorShowOperatorName(true)



            val latest by collectLastValue(underTest.shouldShowOperatorNameView)

            transitionKeyguardToGone()
@@ -546,7 +546,7 @@ class HomeStatusBarViewModelImplTest : SysuiTestCase() { 
    @Test

    fun shouldShowOperatorNameView_allowedByInteractor_hunPinned_false() =

        kosmos.runTest {

            kosmos.setCollapsedStatusBarInteractorShowOperatorName(false)

            kosmos.setHomeStatusBarInteractorShowOperatorName(false)



            transitionKeyguardToGone()

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/domain/interactor/CollapsedStatusBarInteractor.kt→packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/domain/interactor/HomeStatusBarInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import kotlinx.coroutines.flow.map 
 */

@OptIn(ExperimentalCoroutinesApi::class)

@SysUISingleton

class CollapsedStatusBarInteractor

class HomeStatusBarInteractor

@Inject

constructor(

    airplaneModeInteractor: AirplaneModeInteractor,

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/viewmodel/HomeStatusBarViewModel.kt

+9 −10
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ import com.android.systemui.statusbar.notification.headsup.PinnedStatus 
import com.android.systemui.statusbar.notification.shared.NotificationsLiveDataStoreRefactor

import com.android.systemui.statusbar.phone.domain.interactor.DarkIconInteractor

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.domain.interactor.HomeStatusBarInteractor

import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel.VisibilityModel

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope
@@ -153,7 +153,7 @@ interface HomeStatusBarViewModel { 
class HomeStatusBarViewModelImpl

@Inject

constructor(

    collapsedStatusBarInteractor: CollapsedStatusBarInteractor,

    homeStatusBarInteractor: HomeStatusBarInteractor,

    private val lightsOutInteractor: LightsOutInteractor,

    private val notificationsInteractor: ActiveNotificationsInteractor,

    private val darkIconInteractor: DarkIconInteractor,
@@ -270,8 +270,8 @@ constructor( 
        combine(

            shouldHomeStatusBarBeVisible,

            headsUpNotificationInteractor.statusBarHeadsUpState,

            collapsedStatusBarInteractor.visibilityViaDisableFlags,

            collapsedStatusBarInteractor.shouldShowOperatorName,

            homeStatusBarInteractor.visibilityViaDisableFlags,

            homeStatusBarInteractor.shouldShowOperatorName,

        ) { shouldStatusBarBeVisible, headsUpState, visibilityViaDisableFlags, shouldShowOperator ->

            val hideForHeadsUp = headsUpState == PinnedStatus.PinnedBySystem

            shouldStatusBarBeVisible &&
@@ -284,7 +284,7 @@ constructor( 
        combine(

            shouldHomeStatusBarBeVisible,

            headsUpNotificationInteractor.statusBarHeadsUpState,

            collapsedStatusBarInteractor.visibilityViaDisableFlags,

            homeStatusBarInteractor.visibilityViaDisableFlags,

        ) { shouldStatusBarBeVisible, headsUpState, visibilityViaDisableFlags ->

            val hideClockForHeadsUp = headsUpState == PinnedStatus.PinnedBySystem

            val showClock =
@@ -299,7 +299,7 @@ constructor( 
        combine(

            shouldHomeStatusBarBeVisible,

            isAnyChipVisible,

            collapsedStatusBarInteractor.visibilityViaDisableFlags,

            homeStatusBarInteractor.visibilityViaDisableFlags,

        ) { shouldStatusBarBeVisible, anyChipVisible, visibilityViaDisableFlags ->

            val showNotificationIconContainer =

                if (anyChipVisible) {
@@ -315,10 +315,9 @@ constructor( 
        }



    private val isSystemInfoVisible =

        combine(

            shouldHomeStatusBarBeVisible,

            collapsedStatusBarInteractor.visibilityViaDisableFlags,

        ) { shouldStatusBarBeVisible, visibilityViaDisableFlags ->

        combine(shouldHomeStatusBarBeVisible, homeStatusBarInteractor.visibilityViaDisableFlags) {

            shouldStatusBarBeVisible,

            visibilityViaDisableFlags ->

            val showSystemInfo =

                shouldStatusBarBeVisible && visibilityViaDisableFlags.isSystemInfoAllowed

            VisibilityModel(showSystemInfo.toVisibleOrGone(), visibilityViaDisableFlags.animate)

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/shared/domain/interactor/CollapsedStatusBarInteractorKosmos.kt→packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/shared/domain/interactor/HomeStatusBarInteractorKosmos.kt

+3 −3
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ import com.android.systemui.statusbar.pipeline.mobile.data.repository.fake 
import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.carrierConfigInteractor

import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.fakeMobileIconsInteractor



val Kosmos.collapsedStatusBarInteractor: CollapsedStatusBarInteractor by

val Kosmos.homeStatusBarInteractor: HomeStatusBarInteractor by

    Kosmos.Fixture {

        CollapsedStatusBarInteractor(

        HomeStatusBarInteractor(

            airplaneModeInteractor,

            carrierConfigInteractor,

            disableFlagsInteractor,
@@ -37,7 +37,7 @@ val Kosmos.collapsedStatusBarInteractor: CollapsedStatusBarInteractor by 
    }



/** Set the default data subId to 1, and sets the carrier config setting to [show] */

fun Kosmos.setCollapsedStatusBarInteractorShowOperatorName(show: Boolean) {

fun Kosmos.setHomeStatusBarInteractorShowOperatorName(show: Boolean) {

    fakeMobileIconsInteractor.defaultDataSubId.value = 1

    carrierConfigRepository.fake.configsById[1] =

        SystemUiCarrierConfig(