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

Commit 96923a5a authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

[flexiglass] Wire durationScale properly for transition builders. 

We weren't passing in the durationScale and/or were overriding it inside
another function inside the main function.

Test: manually verified that Flexiglass scene transitions when locked
and unlocked still look correct.
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT
Bug: 330672236

Change-Id: Ic9b01ed8fa2bbe4edd0ad75e9e9a854709bd10dd
parent 61500d56

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

+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,13 @@ val SceneContainerTransitions = transitions { 
    ) {

        goneToShadeTransition(durationScale = 0.0)

    }

    from(

        Scenes.Gone,

        to = Scenes.QuickSettings,

        key = CollapseShadeInstantly,

    ) {

        goneToQuickSettingsTransition(durationScale = 0.0)

    }

    from(

        Scenes.Gone,

        to = Scenes.Shade,

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

+1 −3
Original line number Diff line number Diff line 
package com.android.systemui.scene.ui.composable.transitions



import androidx.compose.animation.core.tween

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

import kotlin.time.Duration.Companion.milliseconds



fun TransitionBuilder.goneToQuickSettingsTransition(

    durationScale: Double = 1.0,

) {

    spec = tween(durationMillis = (DefaultDuration * durationScale).inWholeMilliseconds.toInt())

    toQuickSettingsTransition()

    toQuickSettingsTransition(durationScale = durationScale)

}



private val DefaultDuration = 500.milliseconds

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

+1 −6
Original line number Diff line number Diff line 
package com.android.systemui.scene.ui.composable.transitions



import androidx.compose.animation.core.tween

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

import kotlin.time.Duration.Companion.milliseconds



fun TransitionBuilder.goneToShadeTransition(

    durationScale: Double = 1.0,

) {

    spec = tween(durationMillis = (DefaultDuration * durationScale).inWholeMilliseconds.toInt())

    toShadeTransition()

    toShadeTransition(durationScale = durationScale)

}
 


private val DefaultDuration = 500.milliseconds

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

+1 −6
Original line number Diff line number Diff line 
package com.android.systemui.scene.ui.composable.transitions



import androidx.compose.animation.core.tween

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

import kotlin.time.Duration.Companion.milliseconds



fun TransitionBuilder.lockscreenToQuickSettingsTransition(

    durationScale: Double = 1.0,

) {

    spec = tween(durationMillis = (DefaultDuration * durationScale).inWholeMilliseconds.toInt())

    toQuickSettingsTransition()

    toQuickSettingsTransition(durationScale = durationScale)

}
 


private val DefaultDuration = 500.milliseconds

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

+1 −6
Original line number Diff line number Diff line 
package com.android.systemui.scene.ui.composable.transitions



import androidx.compose.animation.core.tween

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

import kotlin.time.Duration.Companion.milliseconds



fun TransitionBuilder.lockscreenToShadeTransition(

    durationScale: Double = 1.0,

) {

    spec = tween(durationMillis = (DefaultDuration * durationScale).inWholeMilliseconds.toInt())

    toShadeTransition()

    toShadeTransition(durationScale = durationScale)

}
 


private val DefaultDuration = 500.milliseconds