Merge "Fix MediaCarousel position in QS" into main (2aa24f45) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/core/src/com/android/compose/windowsizeclass/WindowSizeClass.kt

+2 −3

Original line number	Diff line number	Diff line
		@@ -43,9 +43,8 @@ fun calculateWindowSizeClass(): WindowSizeClass {
		val density = LocalDensity.current
		val context = LocalContext.current
		val metrics =
		remember(context) {
		context.getSystemService(WindowManager::class.java)!!.currentWindowMetrics
		}
		remember(context) { context.getSystemService(WindowManager::class.java)!! }
		.currentWindowMetrics
		val size = with(density) { metrics.bounds.toComposeRect().size.toDpSize() }
		return WindowSizeClass.calculateFromSize(size)
		}

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import com.android.systemui.media.controls.ui.controller.MediaCarouselController
		import com.android.systemui.media.controls.ui.view.MediaHost
		import com.android.systemui.res.R
		import com.android.systemui.util.animation.MeasurementInput
		import kotlinx.coroutines.ExperimentalCoroutinesApi

		object MediaCarousel {
		object Elements {
		@@ -47,7 +46,6 @@ object MediaCarousel {
		}
		}

		@ExperimentalCoroutinesApi
		@Composable
		fun SceneScope.MediaCarousel(
		isVisible: Boolean,
		@@ -79,7 +77,7 @@ fun SceneScope.MediaCarousel(
		offsetProvider?.invoke() ?: IntOffset.Zero
		)
		}
		}
		},
		)
		.layout { measurable, constraints ->
		val placeable = measurable.measure(constraints)
		@@ -89,7 +87,7 @@ fun SceneScope.MediaCarousel(
		MeasurementInput(placeable.width, placeable.height)
		carouselController.setSceneContainerSize(
		placeable.width,
		placeable.height
		placeable.height,
		)

		layout(placeable.width, placeable.height) {
		@@ -106,7 +104,7 @@ fun SceneScope.MediaCarousel(
		}
		},
		update = { it.setView(carouselController.mediaFrame) },
		onRelease = { it.removeAllViews() }
		onRelease = { it.removeAllViews() },
		)
		}
		}

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -392,7 +392,7 @@ private fun SceneScope.QuickSettingsScene(
		{ mediaOffset.roundToPx() },
		)
		}
		Box(modifier = Modifier.padding(horizontal = shadeHorizontalPadding)) {
		Column(modifier = Modifier.padding(horizontal = shadeHorizontalPadding)) {
		if (mediaInRow) {
		Layout(content = content, measurePolicy = landscapeQsMediaMeasurePolicy)
		} else {

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt

+48 −51

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ private val DEBUG = Log.isLoggable(TAG, Log.DEBUG)
		* Class that is responsible for keeping the view carousel up to date. This also handles changes in
		* state and applies them to the media carousel like the expansion.
		*/
		@ExperimentalCoroutinesApi
		@OptIn(ExperimentalCoroutinesApi::class)
		@SysUISingleton
		class MediaCarouselController
		@Inject
		@@ -252,13 +252,13 @@ constructor(
		fun calculateAlpha(
		squishinessFraction: Float,
		startPosition: Float,
		endPosition: Float
		endPosition: Float,
		): Float {
		val transformFraction =
		MathUtils.constrain(
		(squishinessFraction - startPosition) / (endPosition - startPosition),
		0F,
		1F
		1F,
		)
		return TRANSFORM_BEZIER.getInterpolation(transformFraction)
		}
		@@ -354,7 +354,7 @@ constructor(
		this::closeGuts,
		falsingManager,
		this::logSmartspaceImpression,
		logger
		logger,
		)
		carouselLocale = context.resources.configuration.locales.get(0)
		isRtl = context.resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL
		@@ -387,7 +387,7 @@ constructor(
		object : MediaHostStatesManager.Callback {
		override fun onHostStateChanged(
		@MediaLocation location: Int,
		mediaHostState: MediaHostState
		mediaHostState: MediaHostState,
		) {
		updateUserVisibility()
		if (location == desiredLocation) {
		@@ -412,7 +412,7 @@ constructor(
		bgExecutor.execute {
		globalSettings.registerContentObserverSync(
		Settings.Global.getUriFor(Settings.Global.ANIMATOR_DURATION_SCALE),
		animationScaleObserver
		animationScaleObserver,
		)
		}
		}
		@@ -452,7 +452,7 @@ constructor(
		data: MediaData,
		immediately: Boolean,
		receivedSmartspaceCardLatency: Int,
		isSsReactivated: Boolean
		isSsReactivated: Boolean,
		) {
		debugLogger.logMediaLoaded(key, data.active)
		if (addOrUpdatePlayer(key, oldKey, data, isSsReactivated)) {
		@@ -468,7 +468,7 @@ constructor(
		SSPACE_CARD_REPORTED__LOCKSCREEN,
		SSPACE_CARD_REPORTED__DREAM_OVERLAY,
		),
		rank = MediaPlayerData.getMediaPlayerIndex(key)
		rank = MediaPlayerData.getMediaPlayerIndex(key),
		)
		}
		if (
		@@ -500,7 +500,7 @@ constructor(
		SSPACE_CARD_REPORTED__DREAM_OVERLAY,
		),
		rank = index,
		receivedLatencyMillis = receivedSmartspaceCardLatency
		receivedLatencyMillis = receivedSmartspaceCardLatency,
		)
		}
		}
		@@ -533,7 +533,7 @@ constructor(
		override fun onSmartspaceMediaDataLoaded(
		key: String,
		data: SmartspaceMediaData,
		shouldPrioritize: Boolean
		shouldPrioritize: Boolean,
		) {
		debugLogger.logRecommendationLoaded(key, data.isActive)
		// Log the case where the hidden media carousel with the existed inactive resume
		@@ -568,7 +568,7 @@ constructor(
		receivedLatencyMillis =
		(systemClock.currentTimeMillis() -
		data.headphoneConnectionTimeMillis)
		.toInt()
		.toInt(),
		)
		}
		}
		@@ -589,7 +589,7 @@ constructor(
		receivedLatencyMillis =
		(systemClock.currentTimeMillis() -
		data.headphoneConnectionTimeMillis)
		.toInt()
		.toInt(),
		)
		}
		if (
		@@ -644,10 +644,7 @@ constructor(
		mediaCarouselScrollHandler.onSettingsButtonUpdated(settings)
		settingsButton.setOnClickListener {
		logger.logCarouselSettings()
		activityStarter.startActivity(
		settingsIntent,
		/* dismissShade= */ true,
		)
		activityStarter.startActivity(settingsIntent, /* dismissShade= */ true)
		}
		}

		@@ -739,7 +736,7 @@ constructor(
		val lp =
		LinearLayout.LayoutParams(
		ViewGroup.LayoutParams.MATCH_PARENT,
		ViewGroup.LayoutParams.WRAP_CONTENT
		ViewGroup.LayoutParams.WRAP_CONTENT,
		)
		when (commonViewModel) {
		is MediaCommonViewModel.MediaControl -> {
		@@ -785,7 +782,7 @@ constructor(
		) {
		mediaCarouselScrollHandler.scrollToPlayer(
		mediaCarouselScrollHandler.visibleMediaIndex,
		destIndex = 0
		destIndex = 0,
		)
		}
		mediaCarouselScrollHandler.onPlayersChanged()
		@@ -799,7 +796,7 @@ constructor(
		mediaCarouselScrollHandler.onPlayersChanged()
		onAddOrUpdateVisibleToUserCard(
		position,
		commonViewModel is MediaCommonViewModel.MediaControl
		commonViewModel is MediaCommonViewModel.MediaControl,
		)
		}

		@@ -856,7 +853,7 @@ constructor(
		mediaCarouselScrollHandler.qsExpanded,
		mediaCarouselScrollHandler.visibleMediaIndex,
		currentEndLocation,
		isMediaCardUpdate
		isMediaCardUpdate,
		)
		}
		}
		@@ -893,7 +890,7 @@ constructor(
		secureSettings.getBoolForUser(
		Settings.Secure.MEDIA_CONTROLS_LOCK_SCREEN,
		true,
		UserHandle.USER_CURRENT
		UserHandle.USER_CURRENT,
		)
		}
		}
		@@ -926,7 +923,7 @@ constructor(

		private fun reorderAllPlayers(
		previousVisiblePlayerKey: MediaPlayerData.MediaSortKey?,
		key: String? = null
		key: String? = null,
		) {
		mediaContent.removeAllViews()
		for (mediaPlayer in MediaPlayerData.players()) {
		@@ -960,7 +957,7 @@ constructor(
		TAG,
		"Size of players list and number of views in carousel are out of sync. " +
		"Players size is ${MediaPlayerData.players().size}. " +
		"View count is ${mediaContent.childCount}."
		"View count is ${mediaContent.childCount}.",
		)
		}
		}
		@@ -970,7 +967,7 @@ constructor(
		key: String,
		oldKey: String?,
		data: MediaData,
		isSsReactivated: Boolean
		isSsReactivated: Boolean,
		): Boolean =
		traceSection("MediaCarouselController#addOrUpdatePlayer") {
		MediaPlayerData.moveIfExists(oldKey, key)
		@@ -992,7 +989,7 @@ constructor(
		val lp =
		LinearLayout.LayoutParams(
		ViewGroup.LayoutParams.MATCH_PARENT,
		ViewGroup.LayoutParams.WRAP_CONTENT
		ViewGroup.LayoutParams.WRAP_CONTENT,
		)
		newPlayer.mediaViewHolder?.player?.setLayoutParams(lp)
		newPlayer.bindPlayer(data, key)
		@@ -1005,7 +1002,7 @@ constructor(
		newPlayer,
		systemClock,
		isSsReactivated,
		debugLogger
		debugLogger,
		)
		updateViewControllerToState(newPlayer.mediaViewController, noAnimation = true)
		// Media data added from a recommendation card should starts playing.
		@@ -1025,7 +1022,7 @@ constructor(
		existingPlayer,
		systemClock,
		isSsReactivated,
		debugLogger
		debugLogger,
		)
		val packageName = MediaPlayerData.smartspaceMediaData?.packageName ?: String()
		// In case of recommendations hits.
		@@ -1051,7 +1048,7 @@ constructor(
		private fun addSmartspaceMediaRecommendations(
		key: String,
		data: SmartspaceMediaData,
		shouldPrioritize: Boolean
		shouldPrioritize: Boolean,
		) =
		traceSection("MediaCarouselController#addSmartspaceMediaRecommendations") {
		if (DEBUG) Log.d(TAG, "Updating smartspace target in carousel")
		@@ -1090,7 +1087,7 @@ constructor(
		val lp =
		LinearLayout.LayoutParams(
		ViewGroup.LayoutParams.MATCH_PARENT,
		ViewGroup.LayoutParams.WRAP_CONTENT
		ViewGroup.LayoutParams.WRAP_CONTENT,
		)
		newRecs.recommendationViewHolder?.recommendations?.setLayoutParams(lp)
		newRecs.bindRecommendation(data)
		@@ -1117,7 +1114,7 @@ constructor(
		TAG,
		"Size of players list and number of views in carousel are out of sync. " +
		"Players size is ${MediaPlayerData.players().size}. " +
		"View count is ${mediaContent.childCount}."
		"View count is ${mediaContent.childCount}.",
		)
		}
		}
		@@ -1173,7 +1170,7 @@ constructor(
		addSmartspaceMediaRecommendations(
		it.targetId,
		it,
		MediaPlayerData.shouldPrioritizeSs
		MediaPlayerData.shouldPrioritizeSs,
		)
		}
		} else {
		@@ -1185,7 +1182,7 @@ constructor(
		key = key,
		oldKey = null,
		data = data,
		isSsReactivated = isSsReactivated
		isSsReactivated = isSsReactivated,
		)
		}
		if (recreateMedia) {
		@@ -1248,7 +1245,7 @@ constructor(
		@MediaLocation startLocation: Int,
		@MediaLocation endLocation: Int,
		progress: Float,
		immediately: Boolean
		immediately: Boolean,
		) {
		if (
		startLocation != currentStartLocation \|\|
		@@ -1286,7 +1283,7 @@ constructor(
		squishFraction,
		(pageIndicator.translationY + pageIndicator.height) /
		mediaCarousel.measuredHeight,
		1F
		1F,
		)
		var alpha = 1.0f
		if (!endIsVisible \|\| !startIsVisible) {
		@@ -1354,7 +1351,7 @@ constructor(
		currentCarouselHeight = height
		mediaCarouselScrollHandler.setCarouselBounds(
		currentCarouselWidth,
		currentCarouselHeight
		currentCarouselHeight,
		)
		updatePageIndicatorLocation()
		updatePageIndicatorAlpha()
		@@ -1386,13 +1383,13 @@ constructor(

		private fun updateViewControllerToState(
		viewController: MediaViewController,
		noAnimation: Boolean
		noAnimation: Boolean,
		) {
		viewController.setCurrentState(
		startLocation = currentStartLocation,
		endLocation = currentEndLocation,
		transitionProgress = currentTransitionProgress,
		applyImmediately = noAnimation
		applyImmediately = noAnimation,
		)
		}

		@@ -1411,7 +1408,7 @@ constructor(
		desiredHostState: MediaHostState?,
		animate: Boolean,
		duration: Long = 200,
		startDelay: Long = 0
		startDelay: Long = 0,
		) =
		traceSection("MediaCarouselController#onDesiredLocationChanged") {
		desiredHostState?.let {
		@@ -1435,7 +1432,7 @@ constructor(
		if (animate) {
		mediaPlayer.mediaViewController.animatePendingStateChange(
		duration = duration,
		delay = startDelay
		delay = startDelay,
		)
		}
		if (shouldCloseGuts && mediaPlayer.mediaViewController.isGutsVisible) {
		@@ -1506,7 +1503,7 @@ constructor(
		mediaCarouselViewModel.onCardVisibleToUser(
		qsExpanded,
		mediaCarouselScrollHandler.visibleMediaIndex,
		currentEndLocation
		currentEndLocation,
		)
		return
		}
		@@ -1524,7 +1521,7 @@ constructor(
		800, // SMARTSPACE_CARD_SEEN
		it.mSmartspaceId,
		it.mUid,
		intArrayOf(it.surfaceForSmartspaceLogging)
		intArrayOf(it.surfaceForSmartspaceLogging),
		)
		it.mIsImpressed = true
		}
		@@ -1559,7 +1556,7 @@ constructor(
		interactedSubcardCardinality: Int = 0,
		rank: Int = mediaCarouselScrollHandler.visibleMediaIndex,
		receivedLatencyMillis: Int = 0,
		isSwipeToDismiss: Boolean = false
		isSwipeToDismiss: Boolean = false,
		) {
		if (MediaPlayerData.players().size <= rank) {
		return
		@@ -1600,7 +1597,7 @@ constructor(
		interactedSubcardCardinality,
		receivedLatencyMillis,
		null, // Media cards cannot have subcards.
		null // Media cards don't have dimensions today.
		null, // Media cards don't have dimensions today.
		)

		if (DEBUG) {
		@@ -1613,7 +1610,7 @@ constructor(
		"uid: $uid " +
		"interactedSubcardRank: $interactedSubcardRank " +
		"interactedSubcardCardinality: $interactedSubcardCardinality " +
		"received_latency_millis: $receivedLatencyMillis"
		"received_latency_millis: $receivedLatencyMillis",
		)
		}
		}
		@@ -1633,7 +1630,7 @@ constructor(
		it.mUid,
		intArrayOf(it.surfaceForSmartspaceLogging),
		rank = index,
		isSwipeToDismiss = true
		isSwipeToDismiss = true,
		)
		// Reset card impressed state when swipe to dismissed
		it.mIsImpressed = false
		@@ -1692,7 +1689,7 @@ internal object MediaPlayerData {
		active = true,
		resumeAction = null,
		instanceId = InstanceId.fakeInstanceId(-1),
		appUid = -1
		appUid = -1,
		)

		// Whether should prioritize Smartspace card.
		@@ -1741,7 +1738,7 @@ internal object MediaPlayerData {
		player: MediaControlPanel,
		clock: SystemClock,
		isSsReactivated: Boolean,
		debugLogger: MediaCarouselControllerLogger? = null
		debugLogger: MediaCarouselControllerLogger? = null,
		) {
		val removedPlayer = removeMediaPlayer(key)
		if (removedPlayer != null && removedPlayer != player) {
		@@ -1754,7 +1751,7 @@ internal object MediaPlayerData {
		data,
		key,
		clock.currentTimeMillis(),
		isSsReactivated = isSsReactivated
		isSsReactivated = isSsReactivated,
		)
		mediaData.put(key, sortKey)
		mediaPlayers.put(sortKey, player)
		@@ -1768,7 +1765,7 @@ internal object MediaPlayerData {
		shouldPrioritize: Boolean,
		clock: SystemClock,
		debugLogger: MediaCarouselControllerLogger? = null,
		update: Boolean = false
		update: Boolean = false,
		) {
		shouldPrioritizeSs = shouldPrioritize
		val removedPlayer = removeMediaPlayer(key)
		@@ -1782,7 +1779,7 @@ internal object MediaPlayerData {
		EMPTY.copy(active = data.isActive, isPlaying = false),
		key,
		clock.currentTimeMillis(),
		isSsReactivated = true
		isSsReactivated = true,
		)
		mediaData.put(key, sortKey)
		mediaPlayers.put(sortKey, player)
		@@ -1793,7 +1790,7 @@ internal object MediaPlayerData {
		fun moveIfExists(
		oldKey: String?,
		newKey: String,
		debugLogger: MediaCarouselControllerLogger? = null
		debugLogger: MediaCarouselControllerLogger? = null,
		) {
		if (oldKey == null \|\| oldKey == newKey) {
		return