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

Commit d06a6b54 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixes again outlineVariant on DynamicColor" into udc-dev

parents a69c3fe7 eefcf273

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)