Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40a27975 authored by Selim Cinek's avatar Selim Cinek Committed by Automerger Merge Worker
Browse files

Merge "Fixed an issue where media was transitioning oddly for split shade"... 

Merge "Fixed an issue where media was transitioning oddly for split shade" into sc-dev am: c30bd1c9 am: 8969287a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640412

Change-Id: Id41d3d98832a936aac662ad9b06cda57e57f4d3e
parents 0594ad0d 8969287a

packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt

+3 −1
Original line number Diff line number Diff line
@@ -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)

                }

            }

        }