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

Commit eefcf273 authored by Marcelo Arteiro's avatar Marcelo Arteiro
Browse files

Fixes again outlineVariant on DynamicColor 

This is the change has already been submited on ag/22619556
but was mistakenly overwritten by ag/22647904

Fix: 280128998
Fix: 277251682
Test: atest DeviceDefaultThemeTest
Change-Id: I8f7e2d5bc1c01de1ace09a2ce859fd179d52a07e
parent 50875ae2

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

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ class DynamicColors { 
                Pair.create("surface_variant", MDC.surfaceVariant()),

                Pair.create("on_surface_variant", MDC.onSurfaceVariant()),

                Pair.create("outline", MDC.outline()),

                Pair.create("outline_variant", MDC.outlineVariant()),

                Pair.create("error", MDC.error()),

                Pair.create("on_error", MDC.onError()),

                Pair.create("error_container", MDC.errorContainer()),

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

+4 −0
Original line number Diff line number Diff line
@@ -659,6 +659,10 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { 
                    == mColorScheme.getNeutral1().getS500()

                    && res.getColor(android.R.color.system_neutral2_500, theme)

                    == 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)

                    == MaterialDynamicColors.primaryContainer().getArgb(mDynamicSchemeDark)

                    && res.getColor(android.R.color.system_primary_container_light, theme)