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

Commit ce2a65d3 authored by burakov's avatar burakov
Browse files

[bc25] Add an animated transition for `NotificationsShadeScene`. 

This is a basic transition for the shade from both `Gone` and
`Lockscreen` scenes. Once a motion spec is available, this transition
will be revised and improved.

Test: Manually tested by opening and closing the notifications shade on
a foldable device both in a folded and unfolded configuration.
Test: Unit tests build and pass.
Bug: 342463447
Flag: com.android.systemui.dual_shade

Change-Id: I47eb0e460250b5069c724b1453a5efdd8d28f9bb
parent bb63fc1c

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

+6 −0
Original line number Diff line number Diff line
@@ -8,12 +8,14 @@ import com.android.systemui.scene.shared.model.Scenes 
import com.android.systemui.scene.shared.model.TransitionKeys.SlightlyFasterShadeCollapse

import com.android.systemui.scene.shared.model.TransitionKeys.ToSplitShade

import com.android.systemui.scene.ui.composable.transitions.bouncerToGoneTransition

import com.android.systemui.scene.ui.composable.transitions.goneToNotificationsShadeTransition

import com.android.systemui.scene.ui.composable.transitions.goneToQuickSettingsTransition

import com.android.systemui.scene.ui.composable.transitions.goneToShadeTransition

import com.android.systemui.scene.ui.composable.transitions.goneToSplitShadeTransition

import com.android.systemui.scene.ui.composable.transitions.lockscreenToBouncerTransition

import com.android.systemui.scene.ui.composable.transitions.lockscreenToCommunalTransition

import com.android.systemui.scene.ui.composable.transitions.lockscreenToGoneTransition

import com.android.systemui.scene.ui.composable.transitions.lockscreenToNotificationsShadeTransition

import com.android.systemui.scene.ui.composable.transitions.lockscreenToQuickSettingsTransition

import com.android.systemui.scene.ui.composable.transitions.lockscreenToShadeTransition

import com.android.systemui.scene.ui.composable.transitions.lockscreenToSplitShadeTransition
@@ -37,6 +39,7 @@ val SceneContainerTransitions = transitions { 
    // Scene transitions



    from(Scenes.Bouncer, to = Scenes.Gone) { bouncerToGoneTransition() }

    from(Scenes.Gone, to = Scenes.NotificationsShade) { goneToNotificationsShadeTransition() }

    from(Scenes.Gone, to = Scenes.Shade) { goneToShadeTransition() }

    from(

        Scenes.Gone,
@@ -55,6 +58,9 @@ val SceneContainerTransitions = transitions { 
    from(Scenes.Gone, to = Scenes.QuickSettings) { goneToQuickSettingsTransition() }

    from(Scenes.Lockscreen, to = Scenes.Bouncer) { lockscreenToBouncerTransition() }

    from(Scenes.Lockscreen, to = Scenes.Communal) { lockscreenToCommunalTransition() }

    from(Scenes.Lockscreen, to = Scenes.NotificationsShade) {

        lockscreenToNotificationsShadeTransition()

    }

    from(Scenes.Lockscreen, to = Scenes.Shade) { lockscreenToShadeTransition() }

    from(

        Scenes.Lockscreen,

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

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



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



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



fun TransitionBuilder.goneToNotificationsShadeTransition(

    durationScale: Double = 1.0,

) {

    toNotificationsShadeTransition(durationScale)

}

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

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



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



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



fun TransitionBuilder.lockscreenToNotificationsShadeTransition(

    durationScale: Double = 1.0,

) {

    toNotificationsShadeTransition(durationScale)

}

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

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



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



import androidx.compose.animation.core.Spring

import androidx.compose.animation.core.spring

import androidx.compose.animation.core.tween

import androidx.compose.foundation.gestures.Orientation

import androidx.compose.ui.unit.IntSize

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

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

import com.android.compose.animation.scene.UserActionDistance

import com.android.compose.animation.scene.UserActionDistanceScope

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

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

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

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

import kotlin.time.Duration.Companion.milliseconds



fun TransitionBuilder.toNotificationsShadeTransition(

    durationScale: Double = 1.0,

) {

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

    swipeSpec =

        spring(

            stiffness = Spring.StiffnessMediumLow,

            visibilityThreshold = Shade.Dimensions.ScrimVisibilityThreshold,

        )

    distance =

        object : UserActionDistance {

            override fun UserActionDistanceScope.absoluteDistance(

                fromSceneSize: IntSize,

                orientation: Orientation,

            ): Float {

                return fromSceneSize.height.toFloat() * 2 / 3f

            }

        }



    translate(OverlayShade.Elements.PanelBackground, Edge.Top)

    translate(Notifications.Elements.NotificationScrim, Edge.Top)



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



    fractionRange(start = .5f) {

        fade(ShadeHeader.Elements.Clock)

        fade(ShadeHeader.Elements.ExpandedContent)

        fade(ShadeHeader.Elements.PrivacyChip)

        fade(Notifications.Elements.NotificationScrim)

    }

}



private val DefaultDuration = 300.milliseconds