diff options
| author | 2024-07-24 19:16:21 +0000 | |
|---|---|---|
| committer | 2024-07-24 19:16:21 +0000 | |
| commit | f061199eec165d9cffa2ea94e8580d739c96a143 (patch) | |
| tree | 2b76d195bbdb41d1262cb50a7b67da07f70512f6 | |
| parent | 5d1dd8796e5eaf4db3adb4e795a2b050b7e0607d (diff) | |
| parent | 71584b38517c75173d3a7e0bdcb25dcb1c4043fa (diff) | |
Merge "Update edit mode colors" into main
| -rw-r--r-- | packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt index 650c2d3dd909..1c6b4cf32369 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt @@ -791,7 +791,7 @@ private fun ToolbarButton( onClick = onClick, colors = ButtonDefaults.outlinedButtonColors( - contentColor = colors.primary, + contentColor = colors.onPrimaryContainer, ), border = BorderStroke(width = 2.0.dp, color = colors.primary), contentPadding = Dimensions.ButtonPadding, @@ -855,7 +855,7 @@ private fun CommunalContent( /** Creates an empty card used to highlight a particular spot on the grid. */ @Composable fun HighlightedItem(modifier: Modifier = Modifier, alpha: Float = 1.0f) { - val brush = SolidColor(LocalAndroidColorScheme.current.primaryFixed) + val brush = SolidColor(LocalAndroidColorScheme.current.primary) Box( modifier = // drawBehind lets us draw outside the bounds of the widgets so that we don't need to diff --git a/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt b/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt index 398576935eed..03ef17b6ec5b 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/widgets/EditWidgetsActivity.kt @@ -128,7 +128,7 @@ constructor( Box( modifier = Modifier.fillMaxSize() - .background(LocalAndroidColorScheme.current.onSecondaryFixed), + .background(LocalAndroidColorScheme.current.surfaceDim), ) { CommunalHub( viewModel = communalViewModel, |