From 82de27125109d271f9d4535286a2d5cc498905e1 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Mon, 17 May 2021 20:56:57 +0200 Subject: [PATCH] Fixed an issue where media was transitioning oddly for split shade it shouldn't currently do the transitionion until we've fully figured it out. Bug: 184946919 Test: atest SystemUITests Change-Id: I3960a04889b8b4b43110b779315960de0e5b2964 --- .../systemui/statusbar/LockscreenShadeTransitionController.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt index 12f569ce9fbc8..af8d808874740 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt @@ -279,12 +279,14 @@ class LockscreenShadeTransitionController @Inject constructor( nsslController.setTransitionToFullShadeAmount(field) notificationPanelController.setTransitionToFullShadeAmount(field, false /* animate */, 0 /* delay */) - mediaHierarchyManager.setTransitionToFullShadeAmount(field) val scrimProgress = MathUtils.saturate(field / scrimTransitionDistance) scrimController.setTransitionToFullShadeProgress(scrimProgress) // TODO: appear qs also in split shade val qsAmount = if (useSplitShade) 0f else field qS.setTransitionToFullShadeAmount(qsAmount, false /* animate */) + // TODO: appear media also in split shade + val mediaAmount = if (useSplitShade) 0f else field + mediaHierarchyManager.setTransitionToFullShadeAmount(mediaAmount) } } }