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

Commit 5d1926c8 authored by Will Leshner's avatar Will Leshner
Browse files

Replace slide transitions with fade for flexiglass 

Bug: 388284595
Test: manually
Flag: com.android.systemui.scene_container
Change-Id: I63bd601e1c7625c71c32156bcc697e4733779b9f
parent ecf61307

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

+2 −7
Original line number Diff line number Diff line
@@ -17,17 +17,12 @@ 
package com.android.systemui.scene.ui.composable.transitions



import androidx.compose.animation.core.tween

import com.android.compose.animation.scene.Edge

import com.android.compose.animation.scene.TransitionBuilder

import com.android.systemui.communal.ui.compose.AllElements

import com.android.systemui.communal.ui.compose.Communal



fun TransitionBuilder.dreamToCommunalTransition() {

    spec = tween(durationMillis = 1000)



    // Translate communal hub grid from the end direction.

    translate(Communal.Elements.Grid, Edge.End)



    // Fade all communal hub elements.

    timestampRange(startMillis = 167, endMillis = 334) { fade(AllElements) }

    // Fade in all communal hub elements.

    fade(AllElements)

}

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

+2 −11
Original line number Diff line number Diff line
@@ -17,21 +17,12 @@ 
package com.android.systemui.scene.ui.composable.transitions



import androidx.compose.animation.core.tween

import com.android.compose.animation.scene.Edge

import com.android.compose.animation.scene.TransitionBuilder

import com.android.systemui.communal.ui.compose.AllElements

import com.android.systemui.communal.ui.compose.Communal

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



fun TransitionBuilder.lockscreenToCommunalTransition() {

    spec = tween(durationMillis = 1000)



    // Translate lockscreen to the start direction.

    translate(Scenes.Lockscreen.rootElementKey, Edge.Start)



    // Translate communal hub grid from the end direction.

    translate(Communal.Elements.Grid, Edge.End)



    // Fade all communal hub elements.

    timestampRange(startMillis = 167, endMillis = 334) { fade(AllElements) }

    // Fade all communal hub elements in.

    fade(AllElements)

}