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

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

[flexiglass] Changes shade and QS background color. 

Fix: 322484532
Test: manually. First changed the color to red to make sure the correct
background area is modified. Then tested the change on both light and
dark theme.
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT

Change-Id: I0ddce6bd9fce2b058652afec0c3871885650a94d
parent 65679fbb

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

+3 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import androidx.compose.foundation.layout.padding 
import androidx.compose.foundation.layout.wrapContentHeight

import androidx.compose.foundation.rememberScrollState

import androidx.compose.foundation.verticalScroll

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass

import androidx.compose.runtime.Composable

import androidx.compose.runtime.LaunchedEffect
@@ -51,6 +50,7 @@ import androidx.compose.ui.Alignment 
import androidx.compose.ui.Modifier

import androidx.compose.ui.platform.LocalDensity

import androidx.compose.ui.platform.LocalLifecycleOwner

import androidx.compose.ui.res.colorResource

import androidx.compose.ui.unit.dp

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

import com.android.compose.animation.scene.TransitionState
@@ -62,6 +62,7 @@ import com.android.systemui.dagger.SysUISingleton 
import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.qs.footer.ui.compose.FooterActions

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

import com.android.systemui.res.R

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

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

import com.android.systemui.scene.ui.composable.asComposeAware
@@ -168,7 +169,7 @@ private fun SceneScope.QuickSettingsScene( 
            modifier =

                Modifier.element(Shade.Elements.BackgroundScrim)

                    .fillMaxSize()

                    .background(MaterialTheme.colorScheme.scrim)

                    .background(colorResource(R.color.shade_scrim_background_dark))

        )

        Column(

            horizontalAlignment = Alignment.CenterHorizontally,

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.fillMaxWidth 
import androidx.compose.foundation.layout.height

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.shape.RoundedCornerShape

import androidx.compose.material3.MaterialTheme

import androidx.compose.runtime.Composable

import androidx.compose.runtime.collectAsState

import androidx.compose.runtime.getValue
@@ -37,6 +36,7 @@ import androidx.compose.ui.Modifier 
import androidx.compose.ui.layout.Layout

import androidx.compose.ui.layout.layout

import androidx.compose.ui.platform.LocalDensity

import androidx.compose.ui.res.colorResource

import androidx.compose.ui.res.dimensionResource

import androidx.compose.ui.unit.dp

import com.android.compose.animation.scene.ElementKey
@@ -171,7 +171,7 @@ private fun SceneScope.ShadeScene( 
        modifier =

            modifier

                .element(Shade.Elements.BackgroundScrim)

                .background(MaterialTheme.colorScheme.scrim),

                .background(colorResource(R.color.shade_scrim_background_dark)),

    )

    Box {

        Layout(