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

Commit 82de2712 authored by Selim Cinek's avatar Selim Cinek
Browse files

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
parent 8304b95f
Loading
Loading
Loading
Loading
+3 −1
Original line number Original line Diff line number Diff line
@@ -279,12 +279,14 @@ class LockscreenShadeTransitionController @Inject constructor(
                    nsslController.setTransitionToFullShadeAmount(field)
                    nsslController.setTransitionToFullShadeAmount(field)
                    notificationPanelController.setTransitionToFullShadeAmount(field,
                    notificationPanelController.setTransitionToFullShadeAmount(field,
                            false /* animate */, 0 /* delay */)
                            false /* animate */, 0 /* delay */)
                    mediaHierarchyManager.setTransitionToFullShadeAmount(field)
                    val scrimProgress = MathUtils.saturate(field / scrimTransitionDistance)
                    val scrimProgress = MathUtils.saturate(field / scrimTransitionDistance)
                    scrimController.setTransitionToFullShadeProgress(scrimProgress)
                    scrimController.setTransitionToFullShadeProgress(scrimProgress)
                    // TODO: appear qs also in split shade
                    // TODO: appear qs also in split shade
                    val qsAmount = if (useSplitShade) 0f else field
                    val qsAmount = if (useSplitShade) 0f else field
                    qS.setTransitionToFullShadeAmount(qsAmount, false /* animate */)
                    qS.setTransitionToFullShadeAmount(qsAmount, false /* animate */)
                    // TODO: appear media also in split shade
                    val mediaAmount = if (useSplitShade) 0f else field
                    mediaHierarchyManager.setTransitionToFullShadeAmount(mediaAmount)
                }
                }
            }
            }
        }
        }