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

Commit ab06e12c authored Nov 21, 2024 by Priyanka Advani (xWF) Committed by Android (Google) Code Review Nov 21, 2024

Merge changes from topic "revert-30466729-RUBJSPXGKZ" into main

* changes:
  Revert "Make sure StatusBarContentInsetsProvider for correct dis..."
  Revert "PerDisplayStore: remove CoreStartable implementation"

parents c684f636 71d83f59

packages/SystemUI/multivalentTests/src/com/android/systemui/display/data/repository/PerDisplayStoreImplTest.kt

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,11 @@ class PerDisplayStoreImplTest : SysuiTestCase() {

	private val store = kosmos.fakePerDisplayStore		private val store = kosmos.fakePerDisplayStore

			@Before
			fun start() {
			store.start()
			}

	@Before		@Before
	fun addDisplays() = runBlocking {		fun addDisplays() = runBlocking {
	fakeDisplayRepository.addDisplay(createDisplay(DEFAULT_DISPLAY_ID))		fakeDisplayRepository.addDisplay(createDisplay(DEFAULT_DISPLAY_ID))

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/QsBatteryModeControllerTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,7 @@ class QsBatteryModeControllerTest : SysuiTestCase() {

	private val kosmos = testKosmos()		private val kosmos = testKosmos()
	private val insetsProviderStore = kosmos.fakeStatusBarContentInsetsProviderStore		private val insetsProviderStore = kosmos.fakeStatusBarContentInsetsProviderStore
	private val insetsProvider = insetsProviderStore.forDisplay(context.displayId)		private val insetsProvider = insetsProviderStore.defaultDisplay

	@JvmField @Rule val mockitoRule = MockitoJUnit.rule()!!		@JvmField @Rule val mockitoRule = MockitoJUnit.rule()!!

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,11 @@ class LightBarControllerStoreImplTest : SysuiTestCase() {

	private val underTest = kosmos.lightBarControllerStoreImpl		private val underTest = kosmos.lightBarControllerStoreImpl

			@Before
			fun start() {
			underTest.start()
			}

	@Before fun addDisplays() = runBlocking { fakeDisplayRepository.addDisplay(DEFAULT_DISPLAY) }		@Before fun addDisplays() = runBlocking { fakeDisplayRepository.addDisplay(DEFAULT_DISPLAY) }

	@Test		@Test

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -46,6 +46,11 @@ class MultiDisplayDarkIconDispatcherStoreTest : SysuiTestCase() {
	// Lazy so that @EnableFlags has time to run before underTest is instantiated.		// Lazy so that @EnableFlags has time to run before underTest is instantiated.
	private val underTest by lazy { kosmos.multiDisplayDarkIconDispatcherStore }		private val underTest by lazy { kosmos.multiDisplayDarkIconDispatcherStore }

			@Before
			fun start() {
			underTest.start()
			}

	@Before fun addDisplays() = runBlocking { fakeDisplayRepository.addDisplay(DEFAULT_DISPLAY) }		@Before fun addDisplays() = runBlocking { fakeDisplayRepository.addDisplay(DEFAULT_DISPLAY) }

	@Test		@Test

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,11 @@ class MultiDisplayStatusBarContentInsetsProviderStoreTest : SysuiTestCase() {
	private val fakeDisplayRepository = kosmos.displayRepository		private val fakeDisplayRepository = kosmos.displayRepository
	private val underTest = kosmos.multiDisplayStatusBarContentInsetsProviderStore		private val underTest = kosmos.multiDisplayStatusBarContentInsetsProviderStore

			@Before
			fun start() {
			underTest.start()
			}

	@Before fun addDisplays() = runBlocking { fakeDisplayRepository.addDisplay(DEFAULT_DISPLAY) }		@Before fun addDisplays() = runBlocking { fakeDisplayRepository.addDisplay(DEFAULT_DISPLAY) }

	@Test		@Test