Merge "Move communal MediaHost init call to view model" into main (6eb467a6) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt

+0 −6

Original line number	Diff line number	Diff line
		@@ -88,8 +88,6 @@ import com.android.systemui.communal.domain.model.CommunalContentModel
		import com.android.systemui.communal.shared.model.CommunalContentSize
		import com.android.systemui.communal.ui.viewmodel.BaseCommunalViewModel
		import com.android.systemui.communal.ui.viewmodel.CommunalEditModeViewModel
		import com.android.systemui.media.controls.ui.MediaHierarchyManager
		import com.android.systemui.media.controls.ui.MediaHostState
		import com.android.systemui.res.R

		@Composable
		@@ -576,10 +574,6 @@ private fun Umo(viewModel: BaseCommunalViewModel, modifier: Modifier = Modifier)
		AndroidView(
		modifier = modifier,
		factory = {
		viewModel.mediaHost.expansion = MediaHostState.EXPANDED
		viewModel.mediaHost.showsOnlyActiveMedia = false
		viewModel.mediaHost.falsingProtectionNeeded = false
		viewModel.mediaHost.init(MediaHierarchyManager.LOCATION_COMMUNAL_HUB)
		viewModel.mediaHost.hostView.layoutParams =
		FrameLayout.LayoutParams(
		FrameLayout.LayoutParams.MATCH_PARENT,

+9 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import com.android.systemui.communal.ui.viewmodel.CommunalViewModel.Companion.PO
		import com.android.systemui.communal.widgets.WidgetInteractionHandler
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository
		import com.android.systemui.media.controls.ui.MediaHierarchyManager
		import com.android.systemui.media.controls.ui.MediaHost
		import com.android.systemui.smartspace.data.repository.FakeSmartspaceRepository
		import com.android.systemui.util.mockito.mock
		@@ -48,6 +49,7 @@ import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.Mock
		import org.mockito.Mockito
		import org.mockito.Mockito.verify
		import org.mockito.MockitoAnnotations

		@OptIn(ExperimentalCoroutinesApi::class)
		@@ -91,6 +93,13 @@ class CommunalViewModelTest : SysuiTestCase() {
		)
		}

		@Test
		fun init_initsMediaHost() =
		testScope.runTest {
		// MediaHost is initialized as soon as the class is created.
		verify(mediaHost).init(MediaHierarchyManager.LOCATION_COMMUNAL_HUB)
		}

		@Test
		fun tutorial_tutorialNotCompletedAndKeyguardVisible_showTutorialContent() =
		testScope.runTest {

+13 −0

Original line number	Diff line number	Diff line
		@@ -23,7 +23,9 @@ import com.android.systemui.communal.domain.model.CommunalContentModel
		import com.android.systemui.communal.widgets.WidgetInteractionHandler
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		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.dagger.MediaModule
		import javax.inject.Inject
		import javax.inject.Named
		@@ -70,6 +72,17 @@ constructor(
		override val isPopupOnDismissCtaShowing: Flow<Boolean> =
		_isPopupOnDismissCtaShowing.asStateFlow()

		init {
		// Initialize our media host for the UMO. This only needs to happen once and must be done
		// before the MediaHierarchyManager attempts to move the UMO to the hub.
		with(mediaHost) {
		expansion = MediaHostState.EXPANDED
		showsOnlyActiveMedia = false
		falsingProtectionNeeded = false
		init(MediaHierarchyManager.LOCATION_COMMUNAL_HUB)
		}
		}

		override fun onOpenWidgetEditor() = communalInteractor.showWidgetEditor()

		override fun onDismissCtaTile() {