Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "On lockscreen to quick-settings transition, media-player should fade in to quick settings instead of just appear." into tm-qpr-dev

Browse Source
This commit is contained in:
Mike Schneider
2022-07-08 07:31:01 +00:00
committed by Android (Google) Code Review
parent 30ee980ece 593bb3c99e
commit cb1af1ca55
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt
View File

@@ -144,8 +144,7 @@ class MediaHierarchyManager @Inject constructor(
animatedFraction) animatedFraction)
// When crossfading, let's keep the bounds at the right location during fading // When crossfading, let's keep the bounds at the right location during fading
boundsProgress = if (animationCrossFadeProgress < 0.5f) 0.0f else 1.0f boundsProgress = if (animationCrossFadeProgress < 0.5f) 0.0f else 1.0f
currentAlpha = calculateAlphaFromCrossFade(animationCrossFadeProgress, currentAlpha = calculateAlphaFromCrossFade(animationCrossFadeProgress)
instantlyShowAtEnd = false)
} else { } else {
// If we're not crossfading, let's interpolate from the start alpha to 1.0f // If we're not crossfading, let's interpolate from the start alpha to 1.0f
currentAlpha = MathUtils.lerp(animationStartAlpha, 1.0f, animatedFraction) currentAlpha = MathUtils.lerp(animationStartAlpha, 1.0f, animatedFraction)
@@ -276,7 +275,7 @@ class MediaHierarchyManager @Inject constructor(
if (value >= 0) { if (value >= 0) {
updateTargetState() updateTargetState()
// Setting the alpha directly, as the below call will use it to update the alpha // Setting the alpha directly, as the below call will use it to update the alpha
carouselAlpha = calculateAlphaFromCrossFade(field, instantlyShowAtEnd = true) carouselAlpha = calculateAlphaFromCrossFade(field)
applyTargetStateIfNotAnimating() applyTargetStateIfNotAnimating()
} }
} }
@@ -414,18 +413,10 @@ class MediaHierarchyManager @Inject constructor(
* @param crossFadeProgress The current cross fade progress. 0.5f means it's just switching * @param crossFadeProgress The current cross fade progress. 0.5f means it's just switching
* between the start and the end location and the content is fully faded, while 0.75f means * between the start and the end location and the content is fully faded, while 0.75f means
* that we're halfway faded in again in the target state. * that we're halfway faded in again in the target state.
*
* @param instantlyShowAtEnd should the view be instantly shown at the end. This is needed
* to avoid fadinging in when the target was hidden anyway.
*/ */
private fun calculateAlphaFromCrossFade( private fun calculateAlphaFromCrossFade(crossFadeProgress: Float): Float {
crossFadeProgress: Float,
instantlyShowAtEnd: Boolean
): Float {
if (crossFadeProgress <= 0.5f) { if (crossFadeProgress <= 0.5f) {
return 1.0f - crossFadeProgress / 0.5f return 1.0f - crossFadeProgress / 0.5f
} else if (instantlyShowAtEnd) {
return 1.0f
} else { } else {
return (crossFadeProgress - 0.5f) / 0.5f return (crossFadeProgress - 0.5f) / 0.5f
} }