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

Commit 170303c7 authored May 02, 2023 by Treehugger Robot Committed by Automerger Merge Worker May 02, 2023

Merge "Fixes again outlineVariant on DynamicColor" into udc-dev am: d06a6b54 am: 9b07ebca

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

Change-Id: I991d8c0fcc2027dd384b4cd055f05fa0540f1548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents b67bcfdf 9b07ebca

packages/SystemUI/src/com/android/systemui/theme/DynamicColors.kt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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()),

packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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)