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

Commit 507feae5 authored by Chris Göllner's avatar Chris Göllner
Browse files

Prepare StatusBarContentInsetsProvider for multi display 

Turn it into an AssistedInject class, so that we can create one per
display, with the correct per display properties.

Test: Build and run
Test: StatusBarContentInsetsProviderTest
Flag: EXEMPT no behavior change
Bug: 373799109
Change-Id: I6183a6c05f56c64c74c1c62c0e1e4067f02bf064
parent 9e39ccc6

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/StatusBarContentInsetsProviderTest.kt

+56 −57
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        var chipBounds = getPrivacyChipBoundingRectForInsets(bounds, dotWidth, chipWidth, isRtl)
@@ -135,7 +135,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        chipBounds = getPrivacyChipBoundingRectForInsets(bounds, dotWidth, chipWidth, isRtl)
@@ -164,8 +164,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
        val chipWidth = 30

        val dotWidth = 10

        val isRtl = false

        val contentRect =

            Rect(/* left = */ 0, /* top = */ 10, /* right = */ 1000, /* bottom = */ 100)

        val contentRect = Rect(/* left= */ 0, /* top= */ 10, /* right= */ 1000, /* bottom= */ 100)



        val chipBounds =

            getPrivacyChipBoundingRectForInsets(contentRect, dotWidth, chipWidth, isRtl)
@@ -207,7 +206,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -228,7 +227,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -251,7 +250,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -263,7 +262,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                minLeftPadding,

                0,

                screenBounds.height() - dcBounds.height() - dotWidth,

                sbHeightLandscape

                sbHeightLandscape,

            )



        bounds =
@@ -278,7 +277,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -320,7 +319,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -331,7 +330,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                protectionBounds.bottom,

                0,

                screenBounds.height() - minRightPadding,

                sbHeightLandscape

                sbHeightLandscape,

            )



        bounds =
@@ -346,7 +345,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -369,7 +368,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -381,7 +380,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                minLeftPadding,

                0,

                screenBounds.height() - protectionBounds.bottom - dotWidth,

                sbHeightLandscape

                sbHeightLandscape,

            )



        bounds =
@@ -396,7 +395,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -415,7 +414,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                left = screenBounds.right - dcWidth,

                top = 0,

                right = screenBounds.right,

                bottom = dcHeight

                bottom = dcHeight,

            )

        val dcBoundsLandscape = Rect(left = 0, top = 0, right = dcHeight, bottom = dcWidth)

        val dcBoundsSeascape =
@@ -423,14 +422,14 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                left = screenBounds.right - dcHeight,

                top = screenBounds.bottom - dcWidth,

                right = screenBounds.right - dcHeight,

                bottom = screenBounds.bottom - dcWidth

                bottom = screenBounds.bottom - dcWidth,

            )

        val dcBoundsUpsideDown =

            Rect(

                left = 0,

                top = screenBounds.bottom - dcHeight,

                right = dcWidth,

                bottom = screenBounds.bottom - dcHeight

                bottom = screenBounds.bottom - dcHeight,

            )

        val minLeftPadding = 20

        val minRightPadding = 20
@@ -448,7 +447,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                left = minLeftPadding,

                top = 0,

                right = dcBoundsPortrait.left - dotWidth,

                bottom = sbHeightPortrait

                bottom = sbHeightPortrait,

            )



        var bounds =
@@ -463,7 +462,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -475,7 +474,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                left = dcBoundsLandscape.height(),

                top = 0,

                right = screenBounds.height() - minRightPadding,

                bottom = sbHeightLandscape

                bottom = sbHeightLandscape,

            )



        bounds =
@@ -490,7 +489,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -502,7 +501,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                left = minLeftPadding,

                top = 0,

                right = screenBounds.width() - minRightPadding,

                bottom = sbHeightPortrait

                bottom = sbHeightPortrait,

            )



        bounds =
@@ -517,7 +516,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -529,7 +528,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                left = minLeftPadding,

                top = 0,

                right = screenBounds.height() - minRightPadding,

                bottom = sbHeightLandscape

                bottom = sbHeightLandscape,

            )



        bounds =
@@ -544,7 +543,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -584,7 +583,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -595,7 +594,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                protectionBounds.bottom,

                0,

                screenBounds.height() - minRightPadding,

                sbHeightLandscape

                sbHeightLandscape,

            )



        bounds =
@@ -610,7 +609,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -633,7 +632,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -645,7 +644,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                minLeftPadding,

                0,

                screenBounds.height() - protectionBounds.bottom - dotWidth,

                sbHeightLandscape

                sbHeightLandscape,

            )



        bounds =
@@ -660,7 +659,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -682,7 +681,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl = false,

                dotWidth = 10,

                bottomAlignedMargin = BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight = 15

                statusBarContentHeight = 15,

            )



        assertThat(bounds.top).isEqualTo(0)
@@ -704,7 +703,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl = false,

                dotWidth = 10,

                bottomAlignedMargin = 5,

                statusBarContentHeight = 15

                statusBarContentHeight = 15,

            )



        // Content in the status bar is centered vertically. To achieve the bottom margin we want,
@@ -756,7 +755,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -777,7 +776,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -798,7 +797,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -809,7 +808,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                minLeftPadding,

                0,

                screenBounds.height() - dcBounds.height() - dotWidth,

                sbHeightLandscape

                sbHeightLandscape,

            )



        bounds =
@@ -824,7 +823,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -860,7 +859,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )

        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -880,7 +879,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )

        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -900,7 +899,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )

        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -920,7 +919,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )

        assertRects(expectedBounds, bounds, currentRotation, targetRotation)

    }
@@ -958,7 +957,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
                isRtl,

                dotWidth,

                BOTTOM_ALIGNED_MARGIN_NONE,

                statusBarContentHeight

                statusBarContentHeight,

            )



        assertRects(expectedBounds, bounds, currentRotation, targetRotation)
@@ -968,12 +967,12 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
    fun testDisplayChanged_returnsUpdatedInsets() {

        // GIVEN: get insets on the first display and switch to the second display

        val provider =

            StatusBarContentInsetsProvider(

            StatusBarContentInsetsProviderImpl(

                contextMock,

                configurationController,

                mock<DumpManager>(),

                mock<CommandRegistry>(),

                mock<SysUICutoutProvider>()

                mock<SysUICutoutProvider>(),

            )



        configuration.windowConfiguration.setMaxBounds(Rect(0, 0, 1080, 2160))
@@ -993,12 +992,12 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
        // GIVEN: get insets on the first display, switch to the second display,

        // get insets and switch back

        val provider =

            StatusBarContentInsetsProvider(

            StatusBarContentInsetsProviderImpl(

                contextMock,

                configurationController,

                mock<DumpManager>(),

                mock<CommandRegistry>(),

                mock<SysUICutoutProvider>()

                mock<SysUICutoutProvider>(),

            )



        configuration.windowConfiguration.setMaxBounds(Rect(0, 0, 1080, 2160))
@@ -1024,12 +1023,12 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
        configuration.windowConfiguration.setMaxBounds(0, 0, 100, 100)

        configurationController.onConfigurationChanged(configuration)

        val provider =

            StatusBarContentInsetsProvider(

            StatusBarContentInsetsProviderImpl(

                contextMock,

                configurationController,

                mock<DumpManager>(),

                mock<CommandRegistry>(),

                mock<SysUICutoutProvider>()

                mock<SysUICutoutProvider>(),

            )

        val listener =

            object : StatusBarContentInsetsChangedListener {
@@ -1053,12 +1052,12 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
    fun onDensityOrFontScaleChanged_listenerNotified() {

        configuration.densityDpi = 12

        val provider =

            StatusBarContentInsetsProvider(

            StatusBarContentInsetsProviderImpl(

                contextMock,

                configurationController,

                mock<DumpManager>(),

                mock<CommandRegistry>(),

                mock<SysUICutoutProvider>()

                mock<SysUICutoutProvider>(),

            )

        val listener =

            object : StatusBarContentInsetsChangedListener {
@@ -1081,12 +1080,12 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
    @Test

    fun onThemeChanged_listenerNotified() {

        val provider =

            StatusBarContentInsetsProvider(

            StatusBarContentInsetsProviderImpl(

                contextMock,

                configurationController,

                mock<DumpManager>(),

                mock<CommandRegistry>(),

                mock<SysUICutoutProvider>()

                mock<SysUICutoutProvider>(),

            )

        val listener =

            object : StatusBarContentInsetsChangedListener {
@@ -1108,13 +1107,13 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
        expected: Rect,

        actual: Rect,

        @Rotation currentRotation: Int,

        @Rotation targetRotation: Int

        @Rotation targetRotation: Int,

    ) {

        assertTrue(

            "Rects must match. currentRotation=${RotationUtils.toString(currentRotation)}" +

                " targetRotation=${RotationUtils.toString(targetRotation)}" +

                " expected=$expected actual=$actual",

            expected.equals(actual)

            expected.equals(actual),

        )

    }
@@ -1126,7 +1125,7 @@ class StatusBarContentInsetsProviderTest : SysuiTestCase() { 
        left: Rect = Rect(),

        top: Rect = Rect(),

        right: Rect = Rect(),

        bottom: Rect = Rect()

        bottom: Rect = Rect(),

    ) {

        whenever(dc.boundingRects)

            .thenReturn(listOf(left, top, right, bottom).filter { !it.isEmpty })

packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarModule.kt

+15 −1
Original line number Diff line number Diff line
@@ -17,17 +17,20 @@ 
package com.android.systemui.statusbar.dagger



import android.content.Context

import com.android.app.viewcapture.ViewCaptureAwareWindowManager

import com.android.systemui.CoreStartable

import com.android.systemui.SysUICutoutProvider

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.log.LogBuffer

import com.android.systemui.log.LogBufferFactory

import com.android.systemui.statusbar.core.StatusBarConnectedDisplays

import com.android.systemui.statusbar.data.StatusBarDataLayerModule

import com.android.systemui.statusbar.phone.LightBarController

import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider

import com.android.systemui.statusbar.phone.StatusBarContentInsetsProviderImpl

import com.android.systemui.statusbar.phone.StatusBarSignalPolicy

import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController

import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallLog

import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.statusbar.ui.SystemBarUtilsProxyImpl

import com.android.systemui.statusbar.window.MultiDisplayStatusBarWindowControllerStore

import com.android.systemui.statusbar.window.SingleDisplayStatusBarWindowControllerStore
@@ -108,5 +111,16 @@ abstract class StatusBarModule { 
        fun provideOngoingCallLogBuffer(factory: LogBufferFactory): LogBuffer {

            return factory.create("OngoingCall", 75)

        }



        @Provides

        @SysUISingleton

        fun contentInsetsProvider(

            factory: StatusBarContentInsetsProviderImpl.Factory,

            context: Context,

            configurationController: ConfigurationController,

            sysUICutoutProvider: SysUICutoutProvider,

        ): StatusBarContentInsetsProvider {

            return factory.create(context, configurationController, sysUICutoutProvider)

        }

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarContentInsetsProvider.kt

+107 −72

File changed.

Preview size limit exceeded, changes collapsed.