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

Commit 30a8feff authored by Evan Laird's avatar Evan Laird
Browse files

[sb] Rename *Fragment* dagger components to Home*

Since we are moving away from the fragment, it makes sense to change the
names of the dagger component/module/scope to `Home`. This better aligns
with how these components are used, which is the home screen status bar

Test: build
Test: atest SystemUITests
Bug: 364360986
Flag: EXEMPT rename from IDE
Change-Id: I22e56b3bf8b9b5439483fcc77f37bd4695786abd
parent 5179ae7c
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import com.android.systemui.Flags
import com.android.systemui.SysuiTestCase
import com.android.systemui.fragments.FragmentHostManager
import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment
import com.android.systemui.statusbar.phone.fragment.dagger.StatusBarFragmentComponent
import com.android.systemui.statusbar.phone.fragment.dagger.HomeStatusBarComponent
import com.android.systemui.statusbar.pipeline.shared.ui.composable.StatusBarRootFactory
import com.android.systemui.statusbar.window.StatusBarWindowController
import com.android.systemui.statusbar.window.StatusBarWindowControllerStore
@@ -70,7 +70,7 @@ class StatusBarInitializerTest : SysuiTestCase() {
            statusBarWindowController = windowController,
            collapsedStatusBarFragmentProvider = { mock(CollapsedStatusBarFragment::class.java) },
            statusBarRootFactory = mock(StatusBarRootFactory::class.java),
            componentFactory = mock(StatusBarFragmentComponent.Factory::class.java),
            componentFactory = mock(HomeStatusBarComponent.Factory::class.java),
            creationListeners = setOf(),
        )

+17 −35
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import com.android.systemui.statusbar.phone.BoundsPair
import com.android.systemui.statusbar.phone.LetterboxAppearance
import com.android.systemui.statusbar.phone.LetterboxAppearanceCalculator
import com.android.systemui.statusbar.phone.StatusBarBoundsProvider
import com.android.systemui.statusbar.phone.fragment.dagger.StatusBarFragmentComponent
import com.android.systemui.statusbar.phone.fragment.dagger.HomeStatusBarComponent
import com.android.systemui.statusbar.phone.ongoingcall.data.repository.ongoingCallRepository
import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel
import com.android.systemui.statusbar.phone.ongoingcall.shared.model.inCallModel
@@ -62,8 +62,8 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
    private val commandQueue = mock<CommandQueue>()
    private val letterboxAppearanceCalculator = mock<LetterboxAppearanceCalculator>()
    private val statusBarBoundsProvider = mock<StatusBarBoundsProvider>()
    private val statusBarFragmentComponent =
        mock<StatusBarFragmentComponent>().also {
    private val homeStatusBarComponent =
        mock<HomeStatusBarComponent>().also {
            whenever(it.boundsProvider).thenReturn(statusBarBoundsProvider)
        }
    private val ongoingCallRepository = kosmos.ongoingCallRepository
@@ -78,7 +78,7 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
            )
            .apply {
                this.start()
                this.onStatusBarViewInitialized(statusBarFragmentComponent)
                this.onStatusBarViewInitialized(homeStatusBarComponent)
            }

    private val commandQueueCallback: CommandQueue.Callbacks
@@ -235,9 +235,7 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
        testScope.runTest {
            val latest by collectLastValue(underTest.isInFullscreenMode)

            onSystemBarAttributesChanged(
                requestedVisibleTypes = WindowInsets.Type.statusBars(),
            )
            onSystemBarAttributesChanged(requestedVisibleTypes = WindowInsets.Type.statusBars())

            assertThat(latest).isFalse()
        }
@@ -247,9 +245,7 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
        testScope.runTest {
            val latest by collectLastValue(underTest.isInFullscreenMode)

            onSystemBarAttributesChanged(
                requestedVisibleTypes = WindowInsets.Type.navigationBars(),
            )
            onSystemBarAttributesChanged(requestedVisibleTypes = WindowInsets.Type.navigationBars())

            assertThat(latest).isTrue()
        }
@@ -259,9 +255,7 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
        testScope.runTest {
            val latest by collectLastValue(underTest.isInFullscreenMode)

            onSystemBarAttributesChanged(
                requestedVisibleTypes = WindowInsets.Type.navigationBars(),
            )
            onSystemBarAttributesChanged(requestedVisibleTypes = WindowInsets.Type.navigationBars())
            assertThat(latest).isTrue()

            onSystemBarAttributesChanged(
@@ -347,7 +341,7 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
            val startingLetterboxAppearance =
                LetterboxAppearance(
                    APPEARANCE_LIGHT_STATUS_BARS,
                    listOf(AppearanceRegion(APPEARANCE_LIGHT_STATUS_BARS, Rect(0, 0, 1, 1)))
                    listOf(AppearanceRegion(APPEARANCE_LIGHT_STATUS_BARS, Rect(0, 0, 1, 1))),
                )
            whenever(
                    letterboxAppearanceCalculator.getLetterboxAppearance(
@@ -371,7 +365,7 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
            val newLetterboxAppearance =
                LetterboxAppearance(
                    APPEARANCE_LOW_PROFILE_BARS,
                    listOf(AppearanceRegion(APPEARANCE_LOW_PROFILE_BARS, Rect(10, 20, 30, 40)))
                    listOf(AppearanceRegion(APPEARANCE_LOW_PROFILE_BARS, Rect(10, 20, 30, 40))),
                )
            whenever(
                    letterboxAppearanceCalculator.getLetterboxAppearance(
@@ -398,9 +392,7 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
            val latest by collectLastValue(underTest.statusBarAppearance)

            ongoingCallRepository.setOngoingCallState(inCallModel(startTimeMs = 34))
            onSystemBarAttributesChanged(
                requestedVisibleTypes = WindowInsets.Type.navigationBars(),
            )
            onSystemBarAttributesChanged(requestedVisibleTypes = WindowInsets.Type.navigationBars())

            assertThat(latest!!.mode).isEqualTo(StatusBarMode.SEMI_TRANSPARENT)
        }
@@ -438,9 +430,7 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
    fun statusBarMode_transientShown_semiTransparent() =
        testScope.runTest {
            val latest by collectLastValue(underTest.statusBarAppearance)
            onSystemBarAttributesChanged(
                appearance = APPEARANCE_OPAQUE_STATUS_BARS,
            )
            onSystemBarAttributesChanged(appearance = APPEARANCE_OPAQUE_STATUS_BARS)

            underTest.showTransient()

@@ -453,7 +443,7 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
            val latest by collectLastValue(underTest.statusBarAppearance)

            onSystemBarAttributesChanged(
                appearance = APPEARANCE_LOW_PROFILE_BARS or APPEARANCE_OPAQUE_STATUS_BARS,
                appearance = APPEARANCE_LOW_PROFILE_BARS or APPEARANCE_OPAQUE_STATUS_BARS
            )

            assertThat(latest!!.mode).isEqualTo(StatusBarMode.LIGHTS_OUT)
@@ -464,9 +454,7 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
        testScope.runTest {
            val latest by collectLastValue(underTest.statusBarAppearance)

            onSystemBarAttributesChanged(
                appearance = APPEARANCE_LOW_PROFILE_BARS,
            )
            onSystemBarAttributesChanged(appearance = APPEARANCE_LOW_PROFILE_BARS)

            assertThat(latest!!.mode).isEqualTo(StatusBarMode.LIGHTS_OUT_TRANSPARENT)
        }
@@ -476,9 +464,7 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
        testScope.runTest {
            val latest by collectLastValue(underTest.statusBarAppearance)

            onSystemBarAttributesChanged(
                appearance = APPEARANCE_OPAQUE_STATUS_BARS,
            )
            onSystemBarAttributesChanged(appearance = APPEARANCE_OPAQUE_STATUS_BARS)

            assertThat(latest!!.mode).isEqualTo(StatusBarMode.OPAQUE)
        }
@@ -488,9 +474,7 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
        testScope.runTest {
            val latest by collectLastValue(underTest.statusBarAppearance)

            onSystemBarAttributesChanged(
                appearance = APPEARANCE_SEMI_TRANSPARENT_STATUS_BARS,
            )
            onSystemBarAttributesChanged(appearance = APPEARANCE_SEMI_TRANSPARENT_STATUS_BARS)

            assertThat(latest!!.mode).isEqualTo(StatusBarMode.SEMI_TRANSPARENT)
        }
@@ -500,9 +484,7 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
        testScope.runTest {
            val latest by collectLastValue(underTest.statusBarAppearance)

            onSystemBarAttributesChanged(
                appearance = 0,
            )
            onSystemBarAttributesChanged(appearance = 0)

            assertThat(latest!!.mode).isEqualTo(StatusBarMode.TRANSPARENT)
        }
@@ -540,7 +522,7 @@ class StatusBarModeRepositoryImplTest : SysuiTestCase() {
                LetterboxDetails(
                    /* letterboxInnerBounds= */ Rect(0, 0, 10, 10),
                    /* letterboxFullBounds= */ Rect(0, 0, 20, 20),
                    /* appAppearance= */ 0
                    /* appAppearance= */ 0,
                )
            )
        private val REGIONS_FROM_LETTERBOX_CALCULATOR =
+5 −5
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import com.android.systemui.statusbar.phone.PhoneStatusBarTransitions
import com.android.systemui.statusbar.phone.PhoneStatusBarView
import com.android.systemui.statusbar.phone.PhoneStatusBarViewController
import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment
import com.android.systemui.statusbar.phone.fragment.dagger.StatusBarFragmentComponent
import com.android.systemui.statusbar.phone.fragment.dagger.HomeStatusBarComponent
import com.android.systemui.statusbar.pipeline.shared.ui.composable.StatusBarRootFactory
import com.android.systemui.statusbar.window.StatusBarWindowController
import dagger.assisted.Assisted
@@ -60,7 +60,7 @@ interface StatusBarInitializer : CoreStartable {
         *   Can be used to retrieve dependencies from that scope, including the status bar root
         *   view.
         */
        fun onStatusBarViewInitialized(component: StatusBarFragmentComponent)
        fun onStatusBarViewInitialized(component: HomeStatusBarComponent)
    }

    interface OnStatusBarViewUpdatedListener {
@@ -81,10 +81,10 @@ constructor(
    @Assisted private val statusBarWindowController: StatusBarWindowController,
    private val collapsedStatusBarFragmentProvider: Provider<CollapsedStatusBarFragment>,
    private val statusBarRootFactory: StatusBarRootFactory,
    private val componentFactory: StatusBarFragmentComponent.Factory,
    private val componentFactory: HomeStatusBarComponent.Factory,
    private val creationListeners: Set<@JvmSuppressWildcards OnStatusBarViewInitializedListener>,
) : StatusBarInitializer {
    private var component: StatusBarFragmentComponent? = null
    private var component: HomeStatusBarComponent? = null

    @get:VisibleForTesting
    var initialized = false
@@ -157,7 +157,7 @@ constructor(
                object : FragmentHostManager.FragmentListener {
                    override fun onFragmentViewCreated(tag: String, fragment: Fragment) {
                        component =
                            (fragment as CollapsedStatusBarFragment).statusBarFragmentComponent
                            (fragment as CollapsedStatusBarFragment).homeStatusBarComponent
                                ?: throw IllegalStateException()
                        statusBarViewUpdatedListener?.onStatusBarViewUpdated(
                            component!!.phoneStatusBarViewController,
+5 −6
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import com.android.systemui.statusbar.data.model.StatusBarMode
import com.android.systemui.statusbar.phone.BoundsPair
import com.android.systemui.statusbar.phone.LetterboxAppearanceCalculator
import com.android.systemui.statusbar.phone.StatusBarBoundsProvider
import com.android.systemui.statusbar.phone.fragment.dagger.StatusBarFragmentComponent
import com.android.systemui.statusbar.phone.fragment.dagger.HomeStatusBarComponent
import com.android.systemui.statusbar.phone.ongoingcall.data.repository.OngoingCallRepository
import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel
import dagger.assisted.Assisted
@@ -174,7 +174,7 @@ constructor(

    private val _statusBarBounds = MutableStateFlow(BoundsPair(Rect(), Rect()))

    override fun onStatusBarViewInitialized(component: StatusBarFragmentComponent) {
    override fun onStatusBarViewInitialized(component: HomeStatusBarComponent) {
        val statusBarBoundsProvider = component.boundsProvider
        val listener =
            object : StatusBarBoundsProvider.BoundsChangeListener {
@@ -196,10 +196,9 @@ constructor(

    /** Modifies the raw [StatusBarAttributes] if letterboxing is needed. */
    private val modifiedStatusBarAttributes: StateFlow<ModifiedStatusBarAttributes?> =
        combine(
                _originalStatusBarAttributes,
                _statusBarBounds,
            ) { originalAttributes, statusBarBounds ->
        combine(_originalStatusBarAttributes, _statusBarBounds) {
                originalAttributes,
                statusBarBounds ->
                if (originalAttributes == null) {
                    null
                } else {
+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import com.android.systemui.CoreStartable
import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.dagger.qualifiers.DisplayId
import com.android.systemui.statusbar.core.StatusBarInitializer
import com.android.systemui.statusbar.phone.fragment.dagger.StatusBarFragmentComponent
import com.android.systemui.statusbar.phone.fragment.dagger.HomeStatusBarComponent
import dagger.Binds
import dagger.Module
import dagger.multibindings.ClassKey
@@ -56,7 +56,7 @@ constructor(
        defaultDisplay.start()
    }

    override fun onStatusBarViewInitialized(component: StatusBarFragmentComponent) {
    override fun onStatusBarViewInitialized(component: HomeStatusBarComponent) {
        defaultDisplay.onStatusBarViewInitialized(component)
    }

Loading