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

Commit f7235f36 authored by Rahul Banerjee's avatar Rahul Banerjee
Browse files

Match Flexiglass Single Shade Scrim Colors to BC25 

Bug: 432333670
Test: Manual (build, push, expand/collapse shade)
Flag: EXEMPT not user facing
Change-Id: I09ef2de121712117606e0220de392fb0848cc48a
parent fd0997af

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt

+2 −2
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ import com.android.compose.modifiers.thenIf 
import com.android.compose.nestedscroll.OnStopScope

import com.android.compose.nestedscroll.PriorityNestedScrollConnection

import com.android.compose.nestedscroll.ScrollController

import com.android.compose.theme.LocalAndroidColorScheme

import com.android.internal.jank.Cuj.CUJ_NOTIFICATION_SHADE_SCROLL_FLING

import com.android.internal.jank.InteractionJankMonitor

import com.android.systemui.common.ui.compose.windowinsets.LocalScreenCornerRadius
@@ -318,8 +319,7 @@ fun ContentScope.NotificationScrollingStack( 
    val density = LocalDensity.current

    val screenCornerRadius = LocalScreenCornerRadius.current

    val scrimCornerRadius = dimensionResource(R.dimen.notification_scrim_corner_radius)

    // TODO(b/428779792): update color to match BC25 spec

    val surfaceEffect0Color = Color.Gray.copy(alpha = 0.5f)

    val surfaceEffect0Color = LocalAndroidColorScheme.current.surfaceEffect0

    val scrollState =

        shadeSession.rememberSaveableSession(saver = ScrollState.Saver, key = "ScrollState") {

            ScrollState(initial = 0)

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

+2 −2
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import com.android.compose.animation.scene.animateContentFloatAsState 
import com.android.compose.animation.scene.content.state.TransitionState

import com.android.compose.modifiers.padding

import com.android.compose.modifiers.thenIf

import com.android.compose.theme.LocalAndroidColorScheme

import com.android.internal.jank.InteractionJankMonitor

import com.android.systemui.common.ui.compose.windowinsets.CutoutLocation

import com.android.systemui.common.ui.compose.windowinsets.LocalDisplayCutout
@@ -253,8 +254,7 @@ private fun ContentScope.SingleShade( 
) {

    val cutout = LocalDisplayCutout.current

    val cutoutInsets = WindowInsets.Companion.displayCutout

    // TODO(b/428779792): update color to match BC25 spec

    val shadePanelColor = Color.Gray.copy(alpha = 0.32f)

    val shadePanelColor = LocalAndroidColorScheme.current.surfaceEffect1

    mediaHost.expansion = if (usingCollapsedLandscapeMedia && isLandscape()) COLLAPSED else EXPANDED



    var maxNotifScrimTop by remember { mutableIntStateOf(0) }