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

Commit 03cab7ec authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Dual Shade] Animate the shade scrim during the transitions." into main

parents ea391bb8 51985a50

packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToNotificationsShadeTransition.kt

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.compose.animation.scene.reveal.verticalContainerReveal 
import com.android.systemui.keyguard.ui.composable.blueprint.ClockElementKeys

import com.android.systemui.notifications.ui.composable.NotificationsShade

import com.android.systemui.scene.shared.model.Overlays

import com.android.systemui.shade.ui.composable.OverlayShade

import kotlin.time.Duration.Companion.milliseconds



fun TransitionBuilder.toNotificationsShadeTransition(
@@ -39,7 +40,8 @@ fun TransitionBuilder.toNotificationsShadeTransition( 


    verticalContainerReveal(NotificationsShade.Elements.Panel, revealHaptics)



    fade(NotificationsShade.Elements.StatusBar)

    fractionRange(end = .5f) { fade(OverlayShade.Elements.Scrim) }

    fractionRange(start = .5f) { fade(NotificationsShade.Elements.StatusBar) }

}



private val DefaultDuration = 300.milliseconds

packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToQuickSettingsShadeTransition.kt

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import com.android.compose.animation.scene.TransitionBuilder 
import com.android.compose.animation.scene.reveal.ContainerRevealHaptics

import com.android.compose.animation.scene.reveal.verticalContainerReveal

import com.android.systemui.qs.ui.composable.QuickSettingsShade

import com.android.systemui.shade.ui.composable.OverlayShade

import kotlin.time.Duration.Companion.milliseconds



fun TransitionBuilder.toQuickSettingsShadeTransition(
@@ -31,7 +32,8 @@ fun TransitionBuilder.toQuickSettingsShadeTransition( 


    verticalContainerReveal(QuickSettingsShade.Elements.Panel, revealHaptics)



    fade(QuickSettingsShade.Elements.StatusBar)

    fractionRange(end = .5f) { fade(OverlayShade.Elements.Scrim) }

    fractionRange(start = .5f) { fade(QuickSettingsShade.Elements.StatusBar) }

}



private val DefaultDuration = 300.milliseconds