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

Commit 8c87b0f9 authored by Rahul Banerjee's avatar Rahul Banerjee Committed by Android (Google) Code Review
Browse files

Merge "Match Flexiglass Single Shade Scrim Colors to BC25" into main

parents f0169562 f7235f36

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

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

import com.android.compose.nestedscroll.OnStopScope

import com.android.compose.nestedscroll.PriorityNestedScrollConnection

import com.android.compose.nestedscroll.PriorityNestedScrollConnection

import com.android.compose.nestedscroll.ScrollController

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.Cuj.CUJ_NOTIFICATION_SHADE_SCROLL_FLING

import com.android.internal.jank.InteractionJankMonitor

import com.android.internal.jank.InteractionJankMonitor

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

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

    val density = LocalDensity.current

    val screenCornerRadius = LocalScreenCornerRadius.current

    val screenCornerRadius = LocalScreenCornerRadius.current

    val scrimCornerRadius = dimensionResource(R.dimen.notification_scrim_corner_radius)

    val scrimCornerRadius = dimensionResource(R.dimen.notification_scrim_corner_radius)

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

    val surfaceEffect0Color = LocalAndroidColorScheme.current.surfaceEffect0

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

    val scrollState =

    val scrollState =

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

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

            ScrollState(initial = 0)

            ScrollState(initial = 0)

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

+2 −2
Original line number Original line 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.animation.scene.content.state.TransitionState

import com.android.compose.modifiers.padding

import com.android.compose.modifiers.padding

import com.android.compose.modifiers.thenIf

import com.android.compose.modifiers.thenIf

import com.android.compose.theme.LocalAndroidColorScheme

import com.android.internal.jank.InteractionJankMonitor

import com.android.internal.jank.InteractionJankMonitor

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

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

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

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

) {

    val cutout = LocalDisplayCutout.current

    val cutout = LocalDisplayCutout.current

    val cutoutInsets = WindowInsets.Companion.displayCutout

    val cutoutInsets = WindowInsets.Companion.displayCutout

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

    val shadePanelColor = LocalAndroidColorScheme.current.surfaceEffect1

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

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

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





    var maxNotifScrimTop by remember { mutableIntStateOf(0) }

    var maxNotifScrimTop by remember { mutableIntStateOf(0) }