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

Commit 2072ec4b authored Jan 12, 2024 by Michael Mikhail

Reorganizing media code to follow recommended architecture

Bug: 325314429
Flag: NONE
Test: atest SystemUITests
Test: Build, checked UI using two UMOs in the carousel.
Change-Id: I7ef387d184fce1970be26ec901f09e50d47c6ec6

parent c3c6024d

packages/SystemUI/compose/features/src/com/android/systemui/media/controls/ui/composable/MediaCarousel.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@ import androidx.compose.ui.Modifier
		import androidx.compose.ui.viewinterop.AndroidView
		import com.android.compose.animation.scene.ElementKey
		import com.android.compose.animation.scene.SceneScope
		import com.android.systemui.media.controls.ui.MediaCarouselController
		import com.android.systemui.media.controls.ui.MediaHost
		import com.android.systemui.media.controls.ui.controller.MediaCarouselController
		import com.android.systemui.media.controls.ui.view.MediaHost
		import com.android.systemui.util.animation.MeasurementInput

		private object MediaCarousel {

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -45,11 +45,11 @@ import com.android.compose.animation.scene.animateSceneFloatAsState
		import com.android.systemui.battery.BatteryMeterViewController
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.media.controls.ui.MediaCarouselController
		import com.android.systemui.media.controls.ui.MediaHierarchyManager
		import com.android.systemui.media.controls.ui.MediaHost
		import com.android.systemui.media.controls.ui.MediaHostState
		import com.android.systemui.media.controls.ui.composable.MediaCarousel
		import com.android.systemui.media.controls.ui.controller.MediaCarouselController
		import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager
		import com.android.systemui.media.controls.ui.view.MediaHost
		import com.android.systemui.media.controls.ui.view.MediaHostState
		import com.android.systemui.media.dagger.MediaModule.QUICK_QS_PANEL
		import com.android.systemui.notifications.ui.composable.NotificationScrollingStack
		import com.android.systemui.qs.ui.composable.QuickSettings

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalMediaRepositoryImplTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@ import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.log.table.TableLogBuffer
		import com.android.systemui.media.controls.models.player.MediaData
		import com.android.systemui.media.controls.pipeline.MediaDataManager
		import com.android.systemui.media.controls.domain.pipeline.MediaDataManager
		import com.android.systemui.media.controls.shared.model.MediaData
		import com.android.systemui.util.mockito.KotlinArgumentCaptor
		import com.android.systemui.util.mockito.whenever
		import com.google.common.truth.Truth.assertThat

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalEditModeViewModelTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ import com.android.systemui.communal.ui.viewmodel.CommunalEditModeViewModel
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.log.logcatLogBuffer
		import com.android.systemui.media.controls.ui.MediaHost
		import com.android.systemui.media.controls.ui.view.MediaHost
		import com.android.systemui.smartspace.data.repository.FakeSmartspaceRepository
		import com.android.systemui.smartspace.data.repository.fakeSmartspaceRepository
		import com.android.systemui.testKosmos

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,8 +43,8 @@ import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository
		import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.log.logcatLogBuffer
		import com.android.systemui.media.controls.ui.MediaHierarchyManager
		import com.android.systemui.media.controls.ui.MediaHost
		import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager
		import com.android.systemui.media.controls.ui.view.MediaHost
		import com.android.systemui.shade.domain.interactor.shadeInteractor
		import com.android.systemui.smartspace.data.repository.FakeSmartspaceRepository
		import com.android.systemui.smartspace.data.repository.fakeSmartspaceRepository