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

Commit bdaad74d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Slightly more realistic shade transitions" into udc-qpr-dev

parents bfb6be36 b4916102

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ fun SceneScope.Notifications( 
    Column(

        modifier =

            modifier

                .element(key = Notifications.Elements.Notifications)

                .fillMaxWidth()

                .defaultMinSize(minHeight = 300.dp)

                .clip(RoundedCornerShape(32.dp))

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

+2 −1
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.Edge

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

import com.android.systemui.scene.ui.composable.QuickSettings



fun TransitionBuilder.goneToQuickSettingsTransition() {

    spec = tween(durationMillis = 500)



    fade(QuickSettings.rootElementKey)

    translate(QuickSettings.rootElementKey, Edge.Top, true)

}

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

+2 −1
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.Edge

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

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



fun TransitionBuilder.goneToShadeTransition() {

    spec = tween(durationMillis = 500)



    fade(Shade.rootElementKey)

    translate(Shade.rootElementKey, Edge.Top, true)

}

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

+2 −1
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.Edge

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

import com.android.systemui.scene.ui.composable.QuickSettings



fun TransitionBuilder.lockscreenToQuickSettingsTransition() {

    spec = tween(durationMillis = 500)



    fade(QuickSettings.rootElementKey)

    translate(QuickSettings.rootElementKey, Edge.Top, true)

}

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

+0 −1
Original line number Diff line number Diff line
@@ -10,6 +10,5 @@ fun TransitionBuilder.shadeToQuickSettingsTransition() { 
    spec = tween(durationMillis = 500)



    translate(Notifications.Elements.Notifications, Edge.Bottom)

    fade(Notifications.Elements.Notifications)

    timestampRange(endMillis = 83) { fade(QuickSettings.Elements.FooterActions) }

}