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

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

Merge "[Dual Shade] Adapt shade colors and transparency to match the UX spec." into main

parents 8ef4bffe 9d918339

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

+11 −2
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import com.android.compose.animation.scene.LowestZIndexContentPicker 
import com.android.compose.windowsizeclass.LocalWindowSizeClass

import com.android.mechanics.behavior.VerticalExpandContainerSpec

import com.android.mechanics.behavior.verticalExpandContainerBackground

import com.android.systemui.Flags

import com.android.systemui.res.R

import com.android.systemui.shade.ui.composable.OverlayShade.rememberShadeExpansionMotion
@@ -189,9 +190,17 @@ object OverlayShade { 
    }



    object Colors {

        val ScrimBackground = Color(0f, 0f, 0f, alpha = 0.2f)

        val ScrimBackground = Color(0f, 0f, 0f, alpha = 0.3f)

        val PanelBackground: Color

            @Composable @ReadOnlyComposable get() = MaterialTheme.colorScheme.surfaceContainer

            @Composable

            @ReadOnlyComposable

            get() {

                return if (Flags.notificationShadeBlur()) {

                    MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.4f)

                } else {

                    MaterialTheme.colorScheme.surfaceContainer

                }

            }

    }



    object Dimensions {

packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeHeaderViewModel.kt

+6 −4
Original line number Diff line number Diff line
@@ -276,15 +276,17 @@ constructor( 


        data object Weak : HeaderChipHighlight {

            override fun backgroundColor(colorScheme: ColorScheme): Color =

                colorScheme.primary.copy(alpha = 0.1f)

                colorScheme.surface.copy(alpha = 0.1f)



            override fun foregroundColor(colorScheme: ColorScheme): Color = colorScheme.primary

            override fun foregroundColor(colorScheme: ColorScheme): Color = colorScheme.onSurface

        }



        data object Strong : HeaderChipHighlight {

            override fun backgroundColor(colorScheme: ColorScheme): Color = colorScheme.secondary

            override fun backgroundColor(colorScheme: ColorScheme): Color =

                colorScheme.primaryContainer



            override fun foregroundColor(colorScheme: ColorScheme): Color = colorScheme.onSecondary

            override fun foregroundColor(colorScheme: ColorScheme): Color =

                colorScheme.onPrimaryContainer

        }

    }