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

Commit f83c0bd1 authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

[flexiglass] Adds burn-in to the Flexi ribbon 

Fix: 392086205
Test: ran System UI and entered/exited AOD
Flag: com.android.systemui.scene_container
Change-Id: If0921a3d7fc6225814638194df1a935622ff353f
parent 2ad472eb

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

+8 −1
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ import com.android.compose.animation.scene.UserActionResult 
import com.android.compose.animation.scene.observableTransitionState

import com.android.compose.animation.scene.rememberMutableSceneTransitionLayoutState

import com.android.compose.gesture.effect.rememberOffsetOverscrollEffectFactory

import com.android.systemui.keyguard.ui.composable.blueprint.rememberBurnIn

import com.android.systemui.keyguard.ui.composable.modifier.burnInAware

import com.android.systemui.lifecycle.rememberActivated

import com.android.systemui.qs.ui.adapter.QSSceneAdapter

import com.android.systemui.qs.ui.composable.QuickSettingsTheme
@@ -239,7 +241,12 @@ fun SceneContainer( 
        BottomRightCornerRibbon(

            content = { Text(text = "flexi\uD83E\uDD43", color = Color.White) },

            colorSaturation = { viewModel.ribbonColorSaturation },

            modifier = Modifier.align(Alignment.BottomEnd),

            modifier =

                Modifier.align(Alignment.BottomEnd)

                    .burnInAware(

                        viewModel = viewModel.burnIn,

                        params = rememberBurnIn(viewModel.clock).parameters,

                    ),

        )

    }

}

packages/SystemUI/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModel.kt

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import com.android.compose.animation.scene.UserActionResult 
import com.android.systemui.classifier.Classifier

import com.android.systemui.classifier.domain.interactor.FalsingInteractor

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor

import com.android.systemui.keyguard.ui.viewmodel.AodBurnInViewModel

import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel

import com.android.systemui.keyguard.ui.viewmodel.LightRevealScrimViewModel

import com.android.systemui.lifecycle.ExclusiveActivatable

import com.android.systemui.lifecycle.Hydrator
@@ -68,6 +70,8 @@ constructor( 
    val lightRevealScrim: LightRevealScrimViewModel,

    val wallpaperViewModel: WallpaperViewModel,

    keyguardInteractor: KeyguardInteractor,

    val burnIn: AodBurnInViewModel,

    val clock: KeyguardClockViewModel,

    @Assisted view: View,

    @Assisted private val motionEventHandlerReceiver: (MotionEventHandler?) -> Unit,

) : ExclusiveActivatable() {

packages/SystemUI/tests/utils/src/com/android/systemui/scene/SceneKosmos.kt

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ import com.android.compose.animation.scene.ObservableTransitionState 
import com.android.systemui.classifier.domain.interactor.falsingInteractor

import com.android.systemui.haptics.msdl.msdlPlayer

import com.android.systemui.keyguard.domain.interactor.keyguardInteractor

import com.android.systemui.keyguard.ui.viewmodel.aodBurnInViewModel

import com.android.systemui.keyguard.ui.viewmodel.keyguardClockViewModel

import com.android.systemui.keyguard.ui.viewmodel.lightRevealScrimViewModel

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.Kosmos.Fixture
@@ -105,6 +107,8 @@ val Kosmos.sceneContainerViewModelFactory by Fixture { 
                lightRevealScrim = lightRevealScrimViewModel,

                wallpaperViewModel = wallpaperViewModel,

                keyguardInteractor = keyguardInteractor,

                burnIn = aodBurnInViewModel,

                clock = keyguardClockViewModel,

            )

    }

}