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

Commit beb30485 authored by Olivier St-Onge's avatar Olivier St-Onge Committed by Android (Google) Code Review
Browse files

Merge "Adjust timings for QS fade in/fade out" into main

parents 3a4fc5af 5cfcf975
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ fun TransitionBuilder.quickQuickSettingsToQuickSettings(
    animateTilesExpansion: () -> Boolean = { true }
) {

    fractionRange(start = 0.5f) { fade(ElementKeys.QuickSettingsContent) }
    fractionRange(start = 0.43f) { fade(ElementKeys.QuickSettingsContent) }

    fractionRange(start = 0.9f) { fade(ElementKeys.FooterActions) }

@@ -32,10 +32,10 @@ fun TransitionBuilder.quickQuickSettingsToQuickSettings(

    sharedElement(ElementKeys.TileElementMatcher, enabled = animateTilesExpansion())

    // This will animate between 0f (QQS) and 0.6, fading in the QQS tiles when coming back
    // from non first page QS. The QS content ends fading out at 0.5f, so there's a brief
    // This will animate between 0f (QQS) and 0.5, fading in the QQS tiles when coming back
    // from non first page QS. The QS content ends fading out at 0.43f, so there's a brief
    // overlap, but because they are really faint, it looks better than complete black without
    // overlap.
    fractionRange(end = 0.6f) { fade(SceneKeys.QqsTileElementMatcher) }
    fractionRange(end = 0.5f) { fade(SceneKeys.QqsTileElementMatcher) }
    anchoredTranslate(SceneKeys.QqsTileElementMatcher, ElementKeys.GridAnchor)
}