Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes again outlineVariant on DynamicColor" into udc-dev am: d06a6b54c2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22952496

Change-Id: I9edbcd47430666c40d5d6ccbdf23abd68404106d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-02 23:53:22 +00:00
committed by Automerger Merge Worker
parent 0ea777dc2e d06a6b54c2
commit 9b07ebca55
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/theme/DynamicColors.kt
View File

@@ -51,6 +51,7 @@ class DynamicColors {
Pair.create("surface_variant", MDC.surfaceVariant()), Pair.create("surface_variant", MDC.surfaceVariant()),
Pair.create("on_surface_variant", MDC.onSurfaceVariant()), Pair.create("on_surface_variant", MDC.onSurfaceVariant()),
Pair.create("outline", MDC.outline()), Pair.create("outline", MDC.outline()),
Pair.create("outline_variant", MDC.outlineVariant()),
Pair.create("error", MDC.error()), Pair.create("error", MDC.error()),
Pair.create("on_error", MDC.onError()), Pair.create("on_error", MDC.onError()),
Pair.create("error_container", MDC.errorContainer()), Pair.create("error_container", MDC.errorContainer()),

4
packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
View File

@@ -659,6 +659,10 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
== mColorScheme.getNeutral1().getS500() == mColorScheme.getNeutral1().getS500()
&& res.getColor(android.R.color.system_neutral2_500, theme) && res.getColor(android.R.color.system_neutral2_500, theme)
== mColorScheme.getNeutral2().getS500() == mColorScheme.getNeutral2().getS500()
&& res.getColor(android.R.color.system_outline_variant_dark, theme)
== MaterialDynamicColors.outlineVariant().getArgb(mDynamicSchemeDark)
&& res.getColor(android.R.color.system_outline_variant_light, theme)
== MaterialDynamicColors.outlineVariant().getArgb(mDynamicSchemeLight)
&& res.getColor(android.R.color.system_primary_container_dark, theme) && res.getColor(android.R.color.system_primary_container_dark, theme)
== MaterialDynamicColors.primaryContainer().getArgb(mDynamicSchemeDark) == MaterialDynamicColors.primaryContainer().getArgb(mDynamicSchemeDark)
&& res.getColor(android.R.color.system_primary_container_light, theme) && res.getColor(android.R.color.system_primary_container_light, theme)