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

Commit 7e185119 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Integrates Content Dynamics Framework." into udc-qpr-dev

parents 056cc05a ae646ee3

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import androidx.compose.ui.Alignment 
import androidx.compose.ui.Modifier

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.unit.dp

import com.android.compose.animation.scene.SceneScope

import com.android.systemui.R

import com.android.systemui.bouncer.ui.viewmodel.AuthMethodBouncerViewModel

import com.android.systemui.bouncer.ui.viewmodel.BouncerViewModel
@@ -81,7 +82,7 @@ constructor( 
            .asStateFlow()



    @Composable

    override fun Content(

    override fun SceneScope.Content(

        modifier: Modifier,

    ) = BouncerScene(viewModel, dialogFactory, modifier)

}

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

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import androidx.compose.runtime.getValue 
import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.unit.dp

import com.android.compose.animation.scene.SceneScope

import com.android.systemui.common.shared.model.Icon

import com.android.systemui.common.ui.compose.Icon

import com.android.systemui.dagger.SysUISingleton
@@ -66,7 +67,7 @@ constructor( 
            )



    @Composable

    override fun Content(

    override fun SceneScope.Content(

        modifier: Modifier,

    ) {

        LockscreenScene(

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import androidx.compose.runtime.Composable 
import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.unit.dp

import com.android.compose.animation.scene.SceneScope

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.qs.ui.viewmodel.QuickSettingsSceneViewModel

import com.android.systemui.scene.shared.model.Direction
@@ -57,7 +58,7 @@ constructor( 
            .asStateFlow()



    @Composable

    override fun Content(

    override fun SceneScope.Content(

        modifier: Modifier,

    ) {

        QuickSettingsScene(

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

+2 −1
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ package com.android.systemui.scene.ui.composable 


import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import com.android.compose.animation.scene.SceneScope

import com.android.systemui.scene.shared.model.Scene



/** Compose-capable extension of [Scene]. */

interface ComposableScene : Scene {

    @Composable fun Content(modifier: Modifier)

    @Composable fun SceneScope.Content(modifier: Modifier)

}

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

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import androidx.compose.material3.Text 
import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import com.android.compose.animation.scene.SceneScope

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.scene.shared.model.Direction

import com.android.systemui.scene.shared.model.SceneKey
@@ -50,7 +51,7 @@ class GoneScene @Inject constructor() : ComposableScene { 
            .asStateFlow()



    @Composable

    override fun Content(

    override fun SceneScope.Content(

        modifier: Modifier,

    ) {

        /*