diff options
35 files changed, 88 insertions, 138 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/data/repository/StatusBarModeRepositoryImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/data/repository/StatusBarModeRepositoryImplTest.kt index ab475c5edb76..feda0c65bd7f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/data/repository/StatusBarModeRepositoryImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/data/repository/StatusBarModeRepositoryImplTest.kt @@ -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 diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/events/PrivacyDotViewControllerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/events/PrivacyDotViewControllerTest.kt index db51a586fcc1..4795a123617f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/events/PrivacyDotViewControllerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/events/PrivacyDotViewControllerTest.kt @@ -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 diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/events/SystemEventChipAnimationControllerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/events/SystemEventChipAnimationControllerTest.kt index 0a9601359397..5f3668af6e45 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/events/SystemEventChipAnimationControllerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/events/SystemEventChipAnimationControllerTest.kt @@ -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 diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.kt index ffd349d744a8..92318b9820b8 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.kt @@ -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 diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/layout/LetterboxAppearanceCalculatorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/LetterboxAppearanceCalculatorTest.kt index f1affbc4db4f..518b327036cb 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/layout/LetterboxAppearanceCalculatorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/LetterboxAppearanceCalculatorTest.kt @@ -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) @@ -117,10 +109,10 @@ class LetterboxAppearanceCalculatorTest : SysuiTestCase() { val letterBoxInnerBoundsCopy = Rect(letterBoxInnerBounds) calculator.getLetterboxAppearance( - TEST_APPEARANCE, - TEST_APPEARANCE_REGIONS, + TEST_APPEARANCE, + TEST_APPEARANCE_REGIONS, listOf(letterboxWithInnerBounds(letterBoxInnerBounds)), - BoundsPair(statusBarStartSideBounds, statusBarEndSideBounds), + BoundsPair(statusBarStartSideBounds, statusBarEndSideBounds) ) expect.that(statusBarStartSideBounds).isEqualTo(statusBarStartSideBoundsCopy) @@ -137,15 +129,11 @@ 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) - .isEqualTo(TEST_APPEARANCE or APPEARANCE_SEMI_TRANSPARENT_STATUS_BARS) + .that(letterboxAppearance.appearance) + .isEqualTo(TEST_APPEARANCE or APPEARANCE_SEMI_TRANSPARENT_STATUS_BARS) expect.that(letterboxAppearance.appearanceRegions).isEqualTo(TEST_APPEARANCE_REGIONS) } @@ -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) = diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/LetterboxBackgroundProviderTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/LetterboxBackgroundProviderTest.kt index 7786689c84d9..788c2cb2a485 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/LetterboxBackgroundProviderTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/LetterboxBackgroundProviderTest.kt @@ -25,7 +25,6 @@ import android.view.IWindowManager import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.statusbar.layout.LetterboxBackgroundProvider import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.mockito.eq import com.android.systemui.util.time.FakeSystemClock @@ -135,7 +134,6 @@ class LetterboxBackgroundProviderTest : SysuiTestCase() { fun isLetterboxBackgroundMultiColored_defaultValue_returnsFalse() { assertThat(provider.isLetterboxBackgroundMultiColored).isEqualTo(false) } - @Test fun isLetterboxBackgroundMultiColored_afterOnStart_executorNotDone_returnsDefaultValue() { whenever(windowManager.isLetterboxBackgroundMultiColored).thenReturn(true) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/LightBarControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/LightBarControllerTest.java index a65ccad6c2f1..9099334b360c 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/LightBarControllerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/LightBarControllerTest.java @@ -51,7 +51,6 @@ import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.statusbar.data.model.StatusBarAppearance; import com.android.systemui.statusbar.data.model.StatusBarMode; import com.android.systemui.statusbar.data.repository.FakeStatusBarModePerDisplayRepository; -import com.android.systemui.statusbar.layout.BoundsPair; import com.android.systemui.statusbar.policy.BatteryController; import kotlinx.coroutines.test.TestScope; diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/layout/StatusBarContentInsetsProviderTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/StatusBarContentInsetsProviderTest.kt index c9c961791e89..7a51b2ddb020 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/layout/StatusBarContentInsetsProviderTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/StatusBarContentInsetsProviderTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.layout +package com.android.systemui.statusbar.phone import android.content.Context import android.content.res.Configuration @@ -32,7 +32,6 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager import com.android.systemui.statusbar.commandline.CommandRegistry import com.android.systemui.statusbar.core.StatusBarConnectedDisplays -import com.android.systemui.statusbar.phone.ConfigurationControllerImpl import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.util.leak.RotationUtils import com.android.systemui.util.leak.RotationUtils.ROTATION_LANDSCAPE diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarModule.kt index eff959d0f83b..46c84fbc19aa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarModule.kt @@ -27,12 +27,12 @@ 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.data.repository.LightBarControllerStore -import com.android.systemui.statusbar.layout.StatusBarContentInsetsProvider -import com.android.systemui.statusbar.layout.StatusBarContentInsetsProviderImpl import com.android.systemui.statusbar.phone.AutoHideController import com.android.systemui.statusbar.phone.AutoHideControllerImpl import com.android.systemui.statusbar.phone.LightBarController import com.android.systemui.statusbar.phone.LightBarControllerImpl +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 @@ -91,7 +91,9 @@ interface StatusBarModule { @SysUISingleton @IntoMap @ClassKey(OngoingCallController::class) - fun ongoingCallController(controller: OngoingCallController): CoreStartable = + fun ongoingCallController( + controller: OngoingCallController + ): CoreStartable = if (StatusBarChipsModernization.isEnabled) { CoreStartable.NOP } else { @@ -102,7 +104,9 @@ interface StatusBarModule { @SysUISingleton @IntoMap @ClassKey(OngoingCallInteractor::class) - fun ongoingCallInteractor(interactor: OngoingCallInteractor): CoreStartable = + fun ongoingCallInteractor( + interactor: OngoingCallInteractor + ): CoreStartable = if (StatusBarChipsModernization.isEnabled) { interactor } else { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/data/model/StatusBarAppearance.kt b/packages/SystemUI/src/com/android/systemui/statusbar/data/model/StatusBarAppearance.kt index b7b91fa662b3..0cd31d06f71a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/data/model/StatusBarAppearance.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/data/model/StatusBarAppearance.kt @@ -17,7 +17,7 @@ package com.android.systemui.statusbar.data.model import com.android.internal.view.AppearanceRegion -import com.android.systemui.statusbar.layout.BoundsPair +import com.android.systemui.statusbar.phone.BoundsPair /** Keeps track of various parameters coordinating the appearance of the status bar. */ data class StatusBarAppearance( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/StatusBarContentInsetsProviderStore.kt b/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/StatusBarContentInsetsProviderStore.kt index 5ea12110b00c..554c46f6c219 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/StatusBarContentInsetsProviderStore.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/StatusBarContentInsetsProviderStore.kt @@ -28,8 +28,8 @@ import com.android.systemui.display.data.repository.PerDisplayStore import com.android.systemui.display.data.repository.PerDisplayStoreImpl import com.android.systemui.display.data.repository.SingleDisplayStore import com.android.systemui.statusbar.core.StatusBarConnectedDisplays -import com.android.systemui.statusbar.layout.StatusBarContentInsetsProvider -import com.android.systemui.statusbar.layout.StatusBarContentInsetsProviderImpl +import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider +import com.android.systemui.statusbar.phone.StatusBarContentInsetsProviderImpl import dagger.Lazy import dagger.Module import dagger.Provides diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/StatusBarModePerDisplayRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/StatusBarModePerDisplayRepository.kt index 7fa9f0e9dcc2..22c37df7db7e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/StatusBarModePerDisplayRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/data/repository/StatusBarModePerDisplayRepository.kt @@ -33,9 +33,9 @@ import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.core.StatusBarInitializer.OnStatusBarViewInitializedListener import com.android.systemui.statusbar.data.model.StatusBarAppearance import com.android.systemui.statusbar.data.model.StatusBarMode -import com.android.systemui.statusbar.layout.BoundsPair -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.LetterboxAppearanceCalculator +import com.android.systemui.statusbar.phone.StatusBarBoundsProvider import com.android.systemui.statusbar.phone.fragment.dagger.HomeStatusBarComponent import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization import com.android.systemui.statusbar.phone.ongoingcall.data.repository.OngoingCallRepository @@ -209,7 +209,9 @@ constructor( override val ongoingProcessRequiresStatusBarVisible = _ongoingProcessRequiresStatusBarVisible.asStateFlow() - override fun setOngoingProcessRequiresStatusBarVisible(requiredVisible: Boolean) { + override fun setOngoingProcessRequiresStatusBarVisible( + requiredVisible: Boolean + ) { _ongoingProcessRequiresStatusBarVisible.value = requiredVisible } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/events/PrivacyDotViewController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/events/PrivacyDotViewController.kt index 63410d7465b8..f7bc23c6eb17 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/events/PrivacyDotViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/events/PrivacyDotViewController.kt @@ -41,8 +41,8 @@ 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.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.policy.ConfigurationController import com.android.systemui.util.concurrency.DelayableExecutor import com.android.systemui.util.leak.RotationUtils diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt index 70632b33f532..1038ad4124ba 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt @@ -36,8 +36,8 @@ import com.android.systemui.dagger.qualifiers.Default import com.android.systemui.res.R import com.android.systemui.statusbar.core.StatusBarConnectedDisplays import com.android.systemui.statusbar.data.repository.StatusBarContentInsetsProviderStore -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.statusbar.window.StatusBarWindowControllerStore import com.android.systemui.util.animation.AnimationUtil.Companion.frames diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java index a339bc98457e..6a77988e5feb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java @@ -47,7 +47,6 @@ import com.android.settingslib.Utils; import com.android.systemui.battery.BatteryMeterView; import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver; import com.android.systemui.res.R; -import com.android.systemui.statusbar.layout.StatusBarContentInsetsProvider; import com.android.systemui.statusbar.phone.SysuiDarkIconDispatcher.DarkChange; import com.android.systemui.statusbar.phone.ui.TintedIconManager; import com.android.systemui.statusbar.phone.userswitcher.StatusBarUserSwitcherContainer; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java index 4c2bfe5ca257..6028f1727f52 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java @@ -64,7 +64,6 @@ import com.android.systemui.statusbar.data.repository.StatusBarContentInsetsProv import com.android.systemui.statusbar.disableflags.DisableStateTracker; import com.android.systemui.statusbar.events.SystemStatusAnimationCallback; import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler; -import com.android.systemui.statusbar.layout.StatusBarContentInsetsProvider; import com.android.systemui.statusbar.notification.AnimatableProperty; import com.android.systemui.statusbar.notification.PropertyAnimator; import com.android.systemui.statusbar.notification.stack.AnimationProperties; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/layout/LetterboxAppearanceCalculator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LetterboxAppearanceCalculator.kt index 1469fe78926e..231a8c65a246 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/layout/LetterboxAppearanceCalculator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LetterboxAppearanceCalculator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.layout +package com.android.systemui.statusbar.phone import android.annotation.ColorInt import android.content.Context @@ -39,7 +39,7 @@ data class LetterboxAppearance( ) { override fun toString(): String { val appearanceString = - ViewDebug.flagsToString(InsetsFlags::class.java, "appearance", appearance) + ViewDebug.flagsToString(InsetsFlags::class.java, "appearance", appearance) return "LetterboxAppearance{$appearanceString, $appearanceRegions}" } } @@ -57,16 +57,14 @@ constructor( private val letterboxBackgroundProvider: LetterboxBackgroundProvider, ) : Dumpable { - private val darkAppearanceIconColor = - context.getColor( - // For a dark background status bar, use a *light* icon color. - com.android.settingslib.R.color.light_mode_icon_color_single_tone - ) - private val lightAppearanceIconColor = - context.getColor( - // For a light background status bar, use a *dark* icon color. - com.android.settingslib.R.color.dark_mode_icon_color_single_tone - ) + private val darkAppearanceIconColor = context.getColor( + // For a dark background status bar, use a *light* icon color. + com.android.settingslib.R.color.light_mode_icon_color_single_tone + ) + private val lightAppearanceIconColor = context.getColor( + // For a light background status bar, use a *dark* icon color. + com.android.settingslib.R.color.dark_mode_icon_color_single_tone + ) init { dumpManager.registerCriticalDumpable(this) @@ -87,11 +85,7 @@ constructor( lastAppearanceRegions = originalAppearanceRegions lastLetterboxes = letterboxes return getLetterboxAppearanceInternal( - letterboxes, - originalAppearance, - originalAppearanceRegions, - statusBarBounds, - ) + letterboxes, originalAppearance, originalAppearanceRegions, statusBarBounds) .also { lastLetterboxAppearance = it } } @@ -124,7 +118,7 @@ constructor( private fun getAppearanceRegions( originalAppearanceRegions: List<AppearanceRegion>, - letterboxes: List<LetterboxDetails>, + letterboxes: List<LetterboxDetails> ): List<AppearanceRegion> { return sanitizeAppearanceRegions(originalAppearanceRegions, letterboxes) + getAllOuterAppearanceRegions(letterboxes) @@ -132,7 +126,7 @@ constructor( private fun sanitizeAppearanceRegions( originalAppearanceRegions: List<AppearanceRegion>, - letterboxes: List<LetterboxDetails>, + letterboxes: List<LetterboxDetails> ): List<AppearanceRegion> = originalAppearanceRegions.map { appearanceRegion -> val matchingLetterbox = @@ -144,20 +138,17 @@ constructor( // full bounds of its window. // Here we want the bounds to be only for the inner bounds of the letterboxed app. AppearanceRegion( - appearanceRegion.appearance, - matchingLetterbox.letterboxInnerBounds, - ) + appearanceRegion.appearance, matchingLetterbox.letterboxInnerBounds) } } private fun originalAppearanceWithScrim( @Appearance originalAppearance: Int, - originalAppearanceRegions: List<AppearanceRegion>, + originalAppearanceRegions: List<AppearanceRegion> ): LetterboxAppearance { return LetterboxAppearance( originalAppearance or APPEARANCE_SEMI_TRANSPARENT_STATUS_BARS, - originalAppearanceRegions, - ) + originalAppearanceRegions) } @Appearance @@ -224,9 +215,7 @@ constructor( lastAppearanceRegion: $lastAppearanceRegions, lastLetterboxes: $lastLetterboxes, lastLetterboxAppearance: $lastLetterboxAppearance - """ - .trimIndent() - ) + """.trimIndent()) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/layout/LetterboxBackgroundProvider.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LetterboxBackgroundProvider.kt index 3d8ced1b865f..34c7059ec991 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/layout/LetterboxBackgroundProvider.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LetterboxBackgroundProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.layout +package com.android.systemui.statusbar.phone import android.annotation.ColorInt import android.app.WallpaperManager @@ -49,7 +49,9 @@ constructor( private set private val wallpaperColorsListener = - WallpaperManager.OnColorsChangedListener { _, _ -> fetchBackgroundColorInfo() } + WallpaperManager.OnColorsChangedListener { _, _ -> + fetchBackgroundColorInfo() + } override fun start() { fetchBackgroundColorInfo() @@ -73,8 +75,6 @@ constructor( """ letterboxBackgroundColor: ${Color.valueOf(letterboxBackgroundColor)} isLetterboxBackgroundMultiColored: $isLetterboxBackgroundMultiColored - """ - .trimIndent() - ) + """.trimIndent()) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LetterboxModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LetterboxModule.kt index 1e6a0f8efb98..2e3f0d0abc0a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LetterboxModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LetterboxModule.kt @@ -18,7 +18,6 @@ package com.android.systemui.statusbar.phone import com.android.systemui.CoreStartable -import com.android.systemui.statusbar.layout.LetterboxBackgroundProvider import dagger.Binds import dagger.Module import dagger.multibindings.ClassKey diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarControllerImpl.java index 0a285519a6ee..ca0c1ac9ce7c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarControllerImpl.java @@ -44,7 +44,6 @@ import com.android.systemui.statusbar.data.model.StatusBarAppearance; import com.android.systemui.statusbar.data.repository.DarkIconDispatcherStore; import com.android.systemui.statusbar.data.repository.StatusBarModePerDisplayRepository; import com.android.systemui.statusbar.data.repository.StatusBarModeRepositoryStore; -import com.android.systemui.statusbar.layout.BoundsPair; import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.util.Compile; import com.android.systemui.util.kotlin.JavaAdapterKt; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt index aa1308931f99..ccd1b6c4e266 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt @@ -46,7 +46,6 @@ import com.android.systemui.shade.shared.flag.ShadeWindowGoesAround import com.android.systemui.shared.animation.UnfoldMoveFromCenterAnimator import com.android.systemui.statusbar.core.StatusBarConnectedDisplays import com.android.systemui.statusbar.data.repository.StatusBarContentInsetsProviderStore -import com.android.systemui.statusbar.layout.StatusBarContentInsetsProvider import com.android.systemui.statusbar.policy.Clock import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.statusbar.window.StatusBarWindowStateController diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/layout/StatusBarBoundsProvider.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarBoundsProvider.kt index ac5b037807a0..3ac0bac95d68 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/layout/StatusBarBoundsProvider.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarBoundsProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.layout +package com.android.systemui.statusbar.phone import android.graphics.Rect import android.view.View diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/layout/StatusBarContentInsetsProvider.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarContentInsetsProvider.kt index f7a9094e0337..41db5f450df8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/layout/StatusBarContentInsetsProvider.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarContentInsetsProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.layout +package com.android.systemui.statusbar.phone import android.annotation.Px import android.content.Context diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/HomeStatusBarComponent.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/HomeStatusBarComponent.java index 7207d0aef3ee..5837752abdaf 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/HomeStatusBarComponent.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/HomeStatusBarComponent.java @@ -21,13 +21,13 @@ import com.android.systemui.dagger.qualifiers.DisplaySpecific; import com.android.systemui.dagger.qualifiers.RootView; import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.statusbar.data.repository.StatusBarConfigurationController; -import com.android.systemui.statusbar.layout.StatusBarBoundsProvider; import com.android.systemui.statusbar.notification.shared.NotificationsLiveDataStoreRefactor; import com.android.systemui.statusbar.phone.HeadsUpAppearanceController; import com.android.systemui.statusbar.phone.LegacyLightsOutNotifController; 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.StatusBarBoundsProvider; import com.android.systemui.statusbar.phone.StatusBarDemoMode; import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment; import com.android.systemui.statusbar.window.StatusBarWindowController; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/StatusBarStartablesModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/StatusBarStartablesModule.kt index b56a9a18d051..ba9181436fb9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/StatusBarStartablesModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/StatusBarStartablesModule.kt @@ -16,7 +16,7 @@ package com.android.systemui.statusbar.phone.fragment.dagger -import com.android.systemui.statusbar.layout.StatusBarBoundsProvider +import com.android.systemui.statusbar.phone.StatusBarBoundsProvider import dagger.Binds import dagger.Module import dagger.multibindings.IntoSet diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowController.kt index ecfcb29a9944..1e043ec48142 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowController.kt @@ -23,7 +23,7 @@ import com.android.app.viewcapture.ViewCaptureAwareWindowManager import com.android.systemui.animation.ActivityTransitionAnimator import com.android.systemui.fragments.FragmentHostManager import com.android.systemui.statusbar.data.repository.StatusBarConfigurationController -import com.android.systemui.statusbar.layout.StatusBarContentInsetsProvider +import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider import java.util.Optional /** Encapsulates all logic for the status bar window state management. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowControllerImpl.java index 8518acb61f84..848e91d6f896 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowControllerImpl.java @@ -58,7 +58,7 @@ import com.android.systemui.res.R; import com.android.systemui.statusbar.core.StatusBarConnectedDisplays; import com.android.systemui.statusbar.core.StatusBarRootModernization; import com.android.systemui.statusbar.data.repository.StatusBarConfigurationController; -import com.android.systemui.statusbar.layout.StatusBarContentInsetsProvider; +import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider; import com.android.systemui.statusbar.window.StatusBarWindowModule.InternalWindowViewInflater; import com.android.systemui.unfold.UnfoldTransitionProgressProvider; import com.android.systemui.unfold.util.JankMonitorTransitionProgressListener; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImplTest.kt index 77ca51c5efcb..4cad5f7378bb 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImplTest.kt @@ -36,7 +36,7 @@ import com.android.systemui.statusbar.events.shared.model.SystemEventAnimationSt import com.android.systemui.statusbar.events.shared.model.SystemEventAnimationState.Idle import com.android.systemui.statusbar.events.shared.model.SystemEventAnimationState.RunningChipAnim import com.android.systemui.statusbar.events.shared.model.SystemEventAnimationState.ShowingPersistentDot -import com.android.systemui.statusbar.layout.StatusBarContentInsetsProvider +import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider import com.android.systemui.statusbar.window.StatusBarWindowController import com.android.systemui.statusbar.window.StatusBarWindowControllerStore import com.android.systemui.util.time.FakeSystemClock diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/layout/StatusBarBoundsProviderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarBoundsProviderTest.kt index 04319f05f6f9..b9cfe21dcad3 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/layout/StatusBarBoundsProviderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarBoundsProviderTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.layout +package com.android.systemui.statusbar.phone import android.graphics.Rect import android.testing.TestableLooper.RunWithLooper @@ -23,6 +23,7 @@ import android.widget.FrameLayout import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.statusbar.phone.StatusBarBoundsProvider.BoundsChangeListener import com.android.systemui.util.mockito.any import com.google.common.truth.Truth.assertThat import org.junit.Before @@ -46,7 +47,7 @@ class StatusBarBoundsProviderTest : SysuiTestCase() { private val END_SIDE_BOUNDS = Rect(250, 300, 350, 400) } - @Mock private lateinit var boundsChangeListener: StatusBarBoundsProvider.BoundsChangeListener + @Mock private lateinit var boundsChangeListener: BoundsChangeListener private lateinit var boundsProvider: StatusBarBoundsProvider diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/FakeStatusBarContentInsetsProviderStore.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/FakeStatusBarContentInsetsProviderStore.kt index 67f8572cf7f0..642c2ff38338 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/FakeStatusBarContentInsetsProviderStore.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/FakeStatusBarContentInsetsProviderStore.kt @@ -17,7 +17,7 @@ package com.android.systemui.statusbar.data.repository import android.view.Display -import com.android.systemui.statusbar.layout.StatusBarContentInsetsProvider +import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider import org.mockito.kotlin.mock class FakeStatusBarContentInsetsProviderStore() : StatusBarContentInsetsProviderStore { diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/StatusBarContentInsetsProviderStoreKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/StatusBarContentInsetsProviderStoreKosmos.kt index af7a4638faf0..a34fb0998c79 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/StatusBarContentInsetsProviderStoreKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/data/repository/StatusBarContentInsetsProviderStoreKosmos.kt @@ -21,7 +21,7 @@ import com.android.systemui.display.data.repository.displayRepository import com.android.systemui.display.data.repository.displayWindowPropertiesRepository import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.applicationCoroutineScope -import com.android.systemui.statusbar.layout.statusBarContentInsetsProviderFactory +import com.android.systemui.statusbar.phone.statusBarContentInsetsProviderFactory import com.android.systemui.sysUICutoutProviderFactory val Kosmos.fakeStatusBarContentInsetsProviderStore by diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/layout/FakeStatusBarContentInsetsProviderFactory.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/FakeStatusBarContentInsetsProviderFactory.kt index ad742c887af1..4fb8cf4a328b 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/layout/FakeStatusBarContentInsetsProviderFactory.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/FakeStatusBarContentInsetsProviderFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.layout +package com.android.systemui.statusbar.phone import android.content.Context import com.android.systemui.SysUICutoutProvider diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/layout/StatusBarContentInsetsProviderKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/StatusBarContentInsetsProviderKosmos.kt index 69e215dcba6a..705df3c15d18 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/layout/StatusBarContentInsetsProviderKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/StatusBarContentInsetsProviderKosmos.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2025 The Android Open Source Project + * Copyright (C) 2024 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.layout +package com.android.systemui.statusbar.phone import com.android.systemui.kosmos.Kosmos import org.mockito.kotlin.mock diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/window/FakeStatusBarWindowControllerFactory.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/window/FakeStatusBarWindowControllerFactory.kt index 3a19547f0713..7eaecb1c4544 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/window/FakeStatusBarWindowControllerFactory.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/window/FakeStatusBarWindowControllerFactory.kt @@ -19,7 +19,7 @@ package com.android.systemui.statusbar.window import android.content.Context import com.android.app.viewcapture.ViewCaptureAwareWindowManager import com.android.systemui.statusbar.data.repository.StatusBarConfigurationController -import com.android.systemui.statusbar.layout.StatusBarContentInsetsProvider +import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider class FakeStatusBarWindowControllerFactory : StatusBarWindowController.Factory { override fun create( diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/window/StatusBarWindowControllerKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/window/StatusBarWindowControllerKosmos.kt index f595aef41e2d..23f2b4221825 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/window/StatusBarWindowControllerKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/window/StatusBarWindowControllerKosmos.kt @@ -22,7 +22,7 @@ import com.android.app.viewcapture.realCaptureAwareWindowManager import com.android.systemui.concurrency.fakeExecutor import com.android.systemui.fragments.fragmentService import com.android.systemui.kosmos.Kosmos -import com.android.systemui.statusbar.layout.statusBarContentInsetsProvider +import com.android.systemui.statusbar.phone.statusBarContentInsetsProvider import com.android.systemui.statusbar.policy.statusBarConfigurationController import java.util.Optional |