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

Commit 9d22106e authored by Anton Potapov's avatar Anton Potapov Committed by Android (Google) Code Review
Browse files

Merge "Split to SplitShade transition into separated ones." into main

parents 3c0fdc2f d53cd9eb

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

+41 −1
Original line number Diff line number Diff line
@@ -16,10 +16,50 @@ 


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.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.qs.ui.composable.QuickSettings

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

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

import kotlin.time.Duration.Companion.milliseconds



fun TransitionBuilder.goneToSplitShadeTransition(

    durationScale: Double = 1.0,

) {

    toSplitShadeTransition(durationScale)

    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

            }

        }



    fractionRange(end = .33f) { fade(Shade.Elements.BackgroundScrim) }



    fractionRange(start = .33f) {

        fade(ShadeHeader.Elements.Clock)

        fade(ShadeHeader.Elements.CollapsedContentStart)

        fade(ShadeHeader.Elements.CollapsedContentEnd)

        fade(ShadeHeader.Elements.PrivacyChip)

        fade(QuickSettings.Elements.SplitShadeQuickSettings)

        fade(QuickSettings.Elements.FooterActions)

        fade(Notifications.Elements.NotificationScrim)

    }

}



private val DefaultDuration = 500.milliseconds

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

+41 −1
Original line number Diff line number Diff line
@@ -16,10 +16,50 @@ 


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.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.qs.ui.composable.QuickSettings

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

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

import kotlin.time.Duration.Companion.milliseconds



fun TransitionBuilder.lockscreenToSplitShadeTransition(

    durationScale: Double = 1.0,

) {

    toSplitShadeTransition(durationScale = durationScale)

    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

            }

        }



    fractionRange(end = .33f) { fade(Shade.Elements.BackgroundScrim) }



    fractionRange(start = .33f) {

        fade(ShadeHeader.Elements.Clock)

        fade(ShadeHeader.Elements.CollapsedContentStart)

        fade(ShadeHeader.Elements.CollapsedContentEnd)

        fade(ShadeHeader.Elements.PrivacyChip)

        fade(QuickSettings.Elements.SplitShadeQuickSettings)

        fade(QuickSettings.Elements.FooterActions)

        fade(Notifications.Elements.NotificationScrim)

    }

}



private val DefaultDuration = 500.milliseconds

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

deleted100644 → 0
+0 −65
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.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.qs.ui.composable.QuickSettings

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

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

import kotlin.time.Duration.Companion.milliseconds



fun TransitionBuilder.toSplitShadeTransition(

    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

            }

        }



    fractionRange(end = .33f) { fade(Shade.Elements.BackgroundScrim) }



    fractionRange(start = .33f) {

        fade(ShadeHeader.Elements.Clock)

        fade(ShadeHeader.Elements.CollapsedContentStart)

        fade(ShadeHeader.Elements.CollapsedContentEnd)

        fade(ShadeHeader.Elements.PrivacyChip)

        fade(QuickSettings.Elements.SplitShadeQuickSettings)

        fade(QuickSettings.Elements.FooterActions)

        fade(Notifications.Elements.NotificationScrim)

    }

}



private val DefaultDuration = 500.milliseconds