Merge "Introduce reordering functionality in media composable" into main (afca21f5) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/remedia/domain/interactor/MediaInteractor.kt

+6 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,8 @@ interface MediaInteractor {

		/** Open media settings. */
		fun openMediaSettings()

		fun reorderMedia()
		}

		@SysUISingleton
		@@ -103,6 +105,10 @@ constructor(
		activityStarter.startActivity(settingsIntent, true)
		}

		override fun reorderMedia() {
		repository.reorderMedia()
		}

		private fun toMediaSessionModel(dataModel: MediaDataModel): MediaSessionModel {
		return object : MediaSessionModel {
		override val key

+3 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import com.android.systemui.media.remedia.shared.model.MediaColorScheme
		import com.android.systemui.media.remedia.shared.model.MediaSessionState
		import com.android.systemui.plugins.FalsingManager
		import com.android.systemui.res.R
		import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider
		import dagger.assisted.Assisted
		import dagger.assisted.AssistedFactory
		import dagger.assisted.AssistedInject
		@@ -53,6 +54,7 @@ class MediaViewModel
		constructor(
		private val interactor: MediaInteractor,
		private val falsingSystem: MediaFalsingSystem,
		val visualStabilityProvider: VisualStabilityProvider,
		@Assisted private val context: Context,
		@Assisted private val carouselVisibility: MediaCarouselVisibility,
		) : ExclusiveActivatable() {
		@@ -308,6 +310,7 @@ constructor(
		}

		override suspend fun onActivated(): Nothing {
		visualStabilityProvider.addPersistentReorderingAllowedListener { interactor.reorderMedia() }
		awaitCancellation()
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import com.android.systemui.media.remedia.domain.interactor.mediaInteractor
		import com.android.systemui.media.remedia.ui.viewmodel.MediaCarouselVisibility
		import com.android.systemui.media.remedia.ui.viewmodel.MediaViewModel
		import com.android.systemui.media.remedia.ui.viewmodel.mediaFalsingSystem
		import com.android.systemui.statusbar.notification.collection.provider.visualStabilityProvider

		val Kosmos.mediaViewModelFactory by
		Kosmos.Fixture {
		@@ -33,6 +34,7 @@ val Kosmos.mediaViewModelFactory by
		return MediaViewModel(
		interactor = mediaInteractor,
		falsingSystem = mediaFalsingSystem,
		visualStabilityProvider = visualStabilityProvider,
		context = context,
		carouselVisibility = carouselVisibility,
		)