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

Commit 675a9cff authored by Matt Pietal's avatar Matt Pietal Committed by Hawkwood
Browse files

Flexi - Implement LS->SHADE 

Add a root lockscreen element, fade out all content on shade
expansion

Bug: 435352048
Test: manual - Expand shade over LS
Flag: EXEMPT bugfix
Change-Id: I62d15e3ab80edaf89962efdaf822e431c850e32f
parent 89c62f2c

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenContent.kt

+5 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.systemui.keyguard.ui.composable.blueprint.ComposableLockscree 
import com.android.systemui.keyguard.ui.viewmodel.LockscreenContentViewModel

import com.android.systemui.lifecycle.rememberViewModel

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

import com.android.systemui.plugins.clocks.LockscreenElementKeys

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationLockscreenScrimViewModel



/**
@@ -84,7 +85,10 @@ class LockscreenContent( 


        val blueprint = blueprintByBlueprintId[viewModel.blueprintId] ?: return

        with(blueprint) {

            Content(viewModel, modifier.sysuiResTag("keyguard_root_view"))

            Content(

                viewModel,

                modifier.sysuiResTag("keyguard_root_view").element(LockscreenElementKeys.Root),

            )

            NotificationLockscreenScrim(notificationLockscreenScrimViewModel)

        }

    }

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

+19 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 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

import com.android.systemui.plugins.clocks.LockscreenElementKeys



fun TransitionBuilder.lockscreenToShadeTransition(

    durationScale: Double = 1.0,

) {

fun TransitionBuilder.lockscreenToShadeTransition(durationScale: Double = 1.0) {

    toShadeTransition(durationScale = durationScale)



    fractionRange(end = 0.2f) { fade(LockscreenElementKeys.Root) }

}

packages/SystemUI/plugin/src/com/android/systemui/plugins/clocks/LockscreenElementKeys.kt

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import com.android.compose.animation.scene.ElementKey 
 * process and the client. These are similar to the view ids used previously.

 */

object LockscreenElementKeys {

    val Root = ElementKey("LockscreenRoot")



    // Element Keys for top level large/small composables

    val ClockLarge = ElementKey("LargeClock")

    val ClockSmall = ElementKey("SmallClock")