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

Commit 70d2ba14 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Wire durationScale properly for transition builders." into main

parents cb463c55 96923a5a

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

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

    ) {

        goneToShadeTransition(durationScale = 0.0)

        goneToShadeTransition(durationScale = 0.0)

    }

    }

    from(

        Scenes.Gone,

        to = Scenes.QuickSettings,

        key = CollapseShadeInstantly,

    ) {

        goneToQuickSettingsTransition(durationScale = 0.0)

    }

    from(

    from(

        Scenes.Gone,

        Scenes.Gone,

        to = Scenes.Shade,

        to = Scenes.Shade,

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

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

package com.android.systemui.scene.ui.composable.transitions





import androidx.compose.animation.core.tween

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

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

import kotlin.time.Duration.Companion.milliseconds

import kotlin.time.Duration.Companion.milliseconds





fun TransitionBuilder.goneToQuickSettingsTransition(

fun TransitionBuilder.goneToQuickSettingsTransition(

    durationScale: Double = 1.0,

    durationScale: Double = 1.0,

) {

) {

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

    toQuickSettingsTransition(durationScale = durationScale)

    toQuickSettingsTransition()

}

}





private val DefaultDuration = 500.milliseconds
 
private val DefaultDuration = 500.milliseconds

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

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

package com.android.systemui.scene.ui.composable.transitions





import androidx.compose.animation.core.tween

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

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

import kotlin.time.Duration.Companion.milliseconds





fun TransitionBuilder.goneToShadeTransition(

fun TransitionBuilder.goneToShadeTransition(

    durationScale: Double = 1.0,

    durationScale: Double = 1.0,

) {

) {

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

    toShadeTransition(durationScale = durationScale)

    toShadeTransition()

}
 
}
 


private val DefaultDuration = 500.milliseconds

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

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

package com.android.systemui.scene.ui.composable.transitions





import androidx.compose.animation.core.tween

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

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

import kotlin.time.Duration.Companion.milliseconds





fun TransitionBuilder.lockscreenToQuickSettingsTransition(

fun TransitionBuilder.lockscreenToQuickSettingsTransition(

    durationScale: Double = 1.0,

    durationScale: Double = 1.0,

) {

) {

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

    toQuickSettingsTransition(durationScale = durationScale)

    toQuickSettingsTransition()

}
 
}
 


private val DefaultDuration = 500.milliseconds

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

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

package com.android.systemui.scene.ui.composable.transitions





import androidx.compose.animation.core.tween

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

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

import kotlin.time.Duration.Companion.milliseconds





fun TransitionBuilder.lockscreenToShadeTransition(

fun TransitionBuilder.lockscreenToShadeTransition(

    durationScale: Double = 1.0,

    durationScale: Double = 1.0,

) {

) {

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

    toShadeTransition(durationScale = durationScale)

    toShadeTransition()

}
 
}
 


private val DefaultDuration = 500.milliseconds