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

Commit 3a1e47dc authored by Liana Kazanova (xWF)'s avatar Liana Kazanova (xWF) Committed by Android (Google) Code Review
Browse files

Merge "Revert "[SB] Create `statusbar.layout` package and move relevant..."" into main

parents 4183ade9 d258d387

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/data/repository/StatusBarModeRepositoryImplTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ import com.android.systemui.coroutines.collectLastValue 
import com.android.systemui.kosmos.Kosmos

import com.android.systemui.statusbar.CommandQueue

import com.android.systemui.statusbar.data.model.StatusBarMode

import com.android.systemui.statusbar.layout.BoundsPair

import com.android.systemui.statusbar.layout.LetterboxAppearance

import com.android.systemui.statusbar.layout.LetterboxAppearanceCalculator

import com.android.systemui.statusbar.layout.StatusBarBoundsProvider

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.HomeStatusBarComponent

import com.android.systemui.statusbar.phone.ongoingcall.data.repository.ongoingCallRepository

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/events/PrivacyDotViewControllerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import com.android.systemui.statusbar.events.PrivacyDotCorner.BottomLeft 
import com.android.systemui.statusbar.events.PrivacyDotCorner.BottomRight

import com.android.systemui.statusbar.events.PrivacyDotCorner.TopLeft

import com.android.systemui.statusbar.events.PrivacyDotCorner.TopRight

import com.android.systemui.statusbar.layout.StatusBarContentInsetsProvider

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

import com.android.systemui.statusbar.policy.FakeConfigurationController

import com.android.systemui.util.concurrency.DelayableExecutor

import com.android.systemui.util.leak.RotationUtils.ROTATION_LANDSCAPE

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/events/SystemEventChipAnimationControllerTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.animation.AnimatorTestRule

import com.android.systemui.statusbar.layout.StatusBarContentInsetsChangedListener

import com.android.systemui.statusbar.layout.StatusBarContentInsetsProvider

import com.android.systemui.statusbar.phone.StatusBarContentInsetsChangedListener

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

import com.android.systemui.statusbar.window.StatusBarWindowController

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.argumentCaptor

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

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import com.android.systemui.statusbar.CommandQueue 
import com.android.systemui.statusbar.StatusBarState

import com.android.systemui.statusbar.data.repository.StatusBarContentInsetsProviderStore

import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler

import com.android.systemui.statusbar.layout.statusBarContentInsetsProvider

import com.android.systemui.statusbar.phone.ui.StatusBarIconController

import com.android.systemui.statusbar.phone.ui.TintedIconManager

import com.android.systemui.statusbar.policy.BatteryController

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/layout/LetterboxAppearanceCalculatorTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/LetterboxAppearanceCalculatorTest.kt

+20 −56
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
 * limitations under the License.

 */



package com.android.systemui.statusbar.layout

package com.android.systemui.statusbar.phone



import android.graphics.Color

import android.graphics.Rect

import android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS

import android.view.WindowInsetsController

import android.view.WindowInsetsController.APPEARANCE_SEMI_TRANSPARENT_STATUS_BARS

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest
@@ -42,7 +42,7 @@ class LetterboxAppearanceCalculatorTest : SysuiTestCase() { 


    companion object {

        private const val DEFAULT_APPEARANCE = 0

        private const val TEST_APPEARANCE = APPEARANCE_LIGHT_STATUS_BARS

        private const val TEST_APPEARANCE = WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS

        private val TEST_APPEARANCE_REGION_BOUNDS = Rect(0, 0, 20, 100)

        private val TEST_APPEARANCE_REGION =

            AppearanceRegion(TEST_APPEARANCE, TEST_APPEARANCE_REGION_BOUNDS)
@@ -74,11 +74,7 @@ class LetterboxAppearanceCalculatorTest : SysuiTestCase() { 


        val letterboxAppearance =

            calculator.getLetterboxAppearance(

                TEST_APPEARANCE,

                TEST_APPEARANCE_REGIONS,

                listOf(letterbox),

                BoundsPair(start, end),

            )

                TEST_APPEARANCE, TEST_APPEARANCE_REGIONS, listOf(letterbox), BoundsPair(start, end))



        expect

            .that(letterboxAppearance.appearance)
@@ -94,11 +90,7 @@ class LetterboxAppearanceCalculatorTest : SysuiTestCase() { 


        val letterboxAppearance =

            calculator.getLetterboxAppearance(

                TEST_APPEARANCE,

                TEST_APPEARANCE_REGIONS,

                listOf(letterbox),

                BoundsPair(start, end),

            )

                TEST_APPEARANCE, TEST_APPEARANCE_REGIONS, listOf(letterbox), BoundsPair(start, end))



        expect

            .that(letterboxAppearance.appearance)
@@ -120,7 +112,7 @@ class LetterboxAppearanceCalculatorTest : SysuiTestCase() { 
                TEST_APPEARANCE,

                TEST_APPEARANCE_REGIONS,

            listOf(letterboxWithInnerBounds(letterBoxInnerBounds)),

            BoundsPair(statusBarStartSideBounds, statusBarEndSideBounds),

            BoundsPair(statusBarStartSideBounds, statusBarEndSideBounds)

        )



        expect.that(statusBarStartSideBounds).isEqualTo(statusBarStartSideBoundsCopy)
@@ -137,11 +129,7 @@ class LetterboxAppearanceCalculatorTest : SysuiTestCase() { 


        val letterboxAppearance =

            calculator.getLetterboxAppearance(

                TEST_APPEARANCE,

                TEST_APPEARANCE_REGIONS,

                listOf(letterbox),

                BoundsPair(start, end),

            )

                TEST_APPEARANCE, TEST_APPEARANCE_REGIONS, listOf(letterbox), BoundsPair(start, end))



        expect

                .that(letterboxAppearance.appearance)
@@ -157,11 +145,7 @@ class LetterboxAppearanceCalculatorTest : SysuiTestCase() { 


        val letterboxAppearance =

            calculator.getLetterboxAppearance(

                TEST_APPEARANCE,

                TEST_APPEARANCE_REGIONS,

                listOf(letterbox),

                BoundsPair(start, end),

            )

                TEST_APPEARANCE, TEST_APPEARANCE_REGIONS, listOf(letterbox), BoundsPair(start, end))



        assertThat(letterboxAppearance.appearance).isEqualTo(TEST_APPEARANCE)

    }
@@ -174,11 +158,7 @@ class LetterboxAppearanceCalculatorTest : SysuiTestCase() { 


        val letterboxAppearance =

            calculator.getLetterboxAppearance(

                TEST_APPEARANCE,

                TEST_APPEARANCE_REGIONS,

                listOf(letterbox),

                BoundsPair(start, end),

            )

                TEST_APPEARANCE, TEST_APPEARANCE_REGIONS, listOf(letterbox), BoundsPair(start, end))



        assertThat(letterboxAppearance.appearance).isEqualTo(TEST_APPEARANCE)

    }
@@ -191,11 +171,7 @@ class LetterboxAppearanceCalculatorTest : SysuiTestCase() { 


        val letterboxAppearance =

            calculator.getLetterboxAppearance(

                TEST_APPEARANCE,

                TEST_APPEARANCE_REGIONS,

                listOf(letterbox),

                BoundsPair(start, end),

            )

                TEST_APPEARANCE, TEST_APPEARANCE_REGIONS, listOf(letterbox), BoundsPair(start, end))



        assertThat(letterboxAppearance.appearance).isEqualTo(TEST_APPEARANCE)

    }
@@ -208,11 +184,7 @@ class LetterboxAppearanceCalculatorTest : SysuiTestCase() { 


        val letterboxAppearance =

            calculator.getLetterboxAppearance(

                TEST_APPEARANCE,

                TEST_APPEARANCE_REGIONS,

                listOf(letterbox),

                BoundsPair(start, end),

            )

                TEST_APPEARANCE, TEST_APPEARANCE_REGIONS, listOf(letterbox), BoundsPair(start, end))



        assertThat(letterboxAppearance.appearance).isEqualTo(TEST_APPEARANCE)

    }
@@ -226,11 +198,7 @@ class LetterboxAppearanceCalculatorTest : SysuiTestCase() { 


        val letterboxAppearance =

            calculator.getLetterboxAppearance(

                TEST_APPEARANCE,

                listOf(letterboxRegion),

                listOf(letterbox),

                BoundsPair(start, end),

            )

                TEST_APPEARANCE, listOf(letterboxRegion), listOf(letterbox), BoundsPair(start, end))



        val letterboxAdaptedRegion = letterboxRegion.copy(bounds = letterbox.letterboxInnerBounds)

        assertThat(letterboxAppearance.appearanceRegions.toList()).contains(letterboxAdaptedRegion)
@@ -244,17 +212,12 @@ class LetterboxAppearanceCalculatorTest : SysuiTestCase() { 
        val letterbox =

            letterboxWithBounds(

                innerBounds = Rect(left = 25, top = 0, right = 75, bottom = 100),

                fullBounds = Rect(left = 0, top = 0, right = 100, bottom = 100),

            )

                fullBounds = Rect(left = 0, top = 0, right = 100, bottom = 100))

        val letterboxRegion = TEST_APPEARANCE_REGION.copy(bounds = letterbox.letterboxFullBounds)



        val letterboxAppearance =

            calculator.getLetterboxAppearance(

                TEST_APPEARANCE,

                listOf(letterboxRegion),

                listOf(letterbox),

                BoundsPair(start, end),

            )

                TEST_APPEARANCE, listOf(letterboxRegion), listOf(letterbox), BoundsPair(start, end))



        val outerRegions =

            listOf(
@@ -267,7 +230,8 @@ class LetterboxAppearanceCalculatorTest : SysuiTestCase() { 
                    Rect(left = 75, top = 0, right = 100, bottom = 100),

                ),

            )

        assertThat(letterboxAppearance.appearanceRegions).containsAtLeastElementsIn(outerRegions)

        assertThat(letterboxAppearance.appearanceRegions)

            .containsAtLeastElementsIn(outerRegions)

    }



    private fun letterboxWithBounds(innerBounds: Rect, fullBounds: Rect) =