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

Commit cb2d612b authored by Ang Li's avatar Ang Li Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "[DO NOT MERGE] Adding SystemUI's Custom Dynamic Tokens"" into main

parents e5f08973 92bbe7e0

core/res/res/values/attrs.xml

+45 −0
Original line number Diff line number Diff line
@@ -1346,6 +1346,51 @@ 
        <attr name="materialColorTertiary" format="color"/>

        <!-- The error color for the app, intended to draw attention to error conditions. @hide -->

        <attr name="materialColorError" format="color"/>













        <!-- System Custom Tokens-->













        <!-- @hide -->













        <attr name="customColorWidgetBackground" format="color"/>













        <!-- @hide -->













        <attr name="customColorClockHour" format="color"/>













        <!-- @hide -->













        <attr name="customColorClockMinute" format="color"/>













        <!-- @hide -->













        <attr name="customColorClockSecond" format="color"/>













        <!-- @hide -->













        <attr name="customColorThemeApp" format="color"/>













        <!-- @hide -->













        <attr name="customColorOnThemeApp" format="color"/>













        <!-- @hide -->













        <attr name="customColorThemeAppRing" format="color"/>













        <!-- @hide -->













        <attr name="customColorOnThemeAppRing" format="color"/>













        <!-- @hide -->













        <attr name="customColorBrandA" format="color"/>













        <!-- @hide -->













        <attr name="customColorBrandB" format="color"/>













        <!-- @hide -->













        <attr name="customColorBrandC" format="color"/>













        <!-- @hide -->













        <attr name="customColorBrandD" format="color"/>













        <!-- @hide -->













        <attr name="customColorUnderSurface" format="color"/>













        <!-- @hide -->













        <attr name="customColorShadeActive" format="color"/>













        <!-- @hide -->













        <attr name="customColorOnShadeActive" format="color"/>













        <!-- @hide -->













        <attr name="customColorOnShadeActiveVariant" format="color"/>













        <!-- @hide -->













        <attr name="customColorShadeInactive" format="color"/>













        <!-- @hide -->













        <attr name="customColorOnShadeInactive" format="color"/>













        <!-- @hide -->













        <attr name="customColorOnShadeInactiveVariant" format="color"/>













        <!-- @hide -->













        <attr name="customColorShadeDisabled" format="color"/>













        <!-- @hide -->













        <attr name="customColorOverviewBackground" format="color"/>



























    </declare-styleable>





























    <!-- **************************************************************** -->

































core/res/res/values/colors.xml



+45
−0




























Original line number
Diff line number
Diff line








@@ -581,6 +581,51 @@













    <color name="system_on_tertiary_fixed">#FFFFFF</color>















    <color name="system_on_tertiary_fixed_variant">#FFFFFF</color>





























    <!--Colors used in Android system, from design system. These values can be overlaid at runtime













     by OverlayManager RROs.-->













    <color name="system_widget_background_light">#EEF0FF</color>













    <color name="system_clock_hour_light">#1D2435</color>













    <color name="system_clock_minute_light">#20386A</color>













    <color name="system_clock_second_light">#000000</color>













    <color name="system_theme_app_light">#2F4578</color>













    <color name="system_on_theme_app_light">#D6DFFF</color>













    <color name="system_theme_app_ring_light">#94AAE4</color>













    <color name="system_on_theme_app_ring_light">#FDD7FA</color>













    <color name="system_brand_a_light">#3A5084</color>













    <color name="system_brand_b_light">#6E7488</color>













    <color name="system_brand_c_light">#6076AC</color>













    <color name="system_brand_d_light">#8C6D8C</color>













    <color name="system_under_surface_light">#000000</color>













    <color name="system_shade_active_light">#D9E2FF</color>













    <color name="system_on_shade_active_light">#152E60</color>













    <color name="system_on_shade_active_variant_light">#2F4578</color>













    <color name="system_shade_inactive_light">#2F3036</color>













    <color name="system_on_shade_inactive_light">#E1E2EC</color>













    <color name="system_on_shade_inactive_variant_light">#C5C6D0</color>













    <color name="system_shade_disabled_light">#0C0E13</color>













    <color name="system_overview_background_light">#50525A</color>













    <color name="system_widget_background_dark">#152E60</color>













    <color name="system_clock_hour_dark">#9AA0B6</color>













    <color name="system_clock_minute_dark">#D8E1FF</color>













    <color name="system_clock_second_dark">#FFFFFF</color>













    <color name="system_theme_app_dark">#D9E2FF</color>













    <color name="system_on_theme_app_dark">#304679</color>













    <color name="system_theme_app_ring_dark">#94AAE4</color>













    <color name="system_on_theme_app_ring_dark">#E0BBDD</color>













    <color name="system_brand_a_dark">#90A6DF</color>













    <color name="system_brand_b_dark">#A4ABC1</color>













    <color name="system_brand_c_dark">#7A90C8</color>













    <color name="system_brand_d_dark">#A886A6</color>













    <color name="system_under_surface_dark">#000000</color>













    <color name="system_shade_active_dark">#D9E2FF</color>













    <color name="system_on_shade_active_dark">#001945</color>













    <color name="system_on_shade_active_variant_dark">#2F4578</color>













    <color name="system_shade_inactive_dark">#2F3036</color>













    <color name="system_on_shade_inactive_dark">#E1E2EC</color>













    <color name="system_on_shade_inactive_variant_dark">#C5C6D0</color>













    <color name="system_shade_disabled_dark">#0C0E13</color>













    <color name="system_overview_background_dark">#C5C6D0</color>





























    <!-- Accessibility shortcut icon background color -->















    <color name="accessibility_feature_background">#5F6368</color> <!-- Google grey 700 -->















    <color name="accessibility_magnification_background">#F50D60</color>

































core/res/res/values/symbols.xml



+65
−0




























Original line number
Diff line number
Diff line








@@ -5292,6 +5292,71 @@













  <java-symbol name="materialColorTertiary" type="attr"/>















  <java-symbol name="materialColorError" type="attr"/>





























  <java-symbol name="customColorWidgetBackground" type="attr"/>













  <java-symbol name="customColorClockHour" type="attr"/>













  <java-symbol name="customColorClockMinute" type="attr"/>













  <java-symbol name="customColorClockSecond" type="attr"/>













  <java-symbol name="customColorThemeApp" type="attr"/>













  <java-symbol name="customColorOnThemeApp" type="attr"/>













  <java-symbol name="customColorThemeAppRing" type="attr"/>













  <java-symbol name="customColorOnThemeAppRing" type="attr"/>













  <java-symbol name="customColorBrandA" type="attr"/>













  <java-symbol name="customColorBrandB" type="attr"/>













  <java-symbol name="customColorBrandC" type="attr"/>













  <java-symbol name="customColorBrandD" type="attr"/>













  <java-symbol name="customColorUnderSurface" type="attr"/>













  <java-symbol name="customColorShadeActive" type="attr"/>













  <java-symbol name="customColorOnShadeActive" type="attr"/>













  <java-symbol name="customColorOnShadeActiveVariant" type="attr"/>













  <java-symbol name="customColorShadeInactive" type="attr"/>













  <java-symbol name="customColorOnShadeInactive" type="attr"/>













  <java-symbol name="customColorOnShadeInactiveVariant" type="attr"/>













  <java-symbol name="customColorShadeDisabled" type="attr"/>













  <java-symbol name="customColorOverviewBackground" type="attr"/>



























  <java-symbol name="system_widget_background_light" type="color"/>













  <java-symbol name="system_clock_hour_light" type="color"/>













  <java-symbol name="system_clock_minute_light" type="color"/>













  <java-symbol name="system_clock_second_light" type="color"/>













  <java-symbol name="system_theme_app_light" type="color"/>













  <java-symbol name="system_on_theme_app_light" type="color"/>













  <java-symbol name="system_theme_app_ring_light" type="color"/>













  <java-symbol name="system_on_theme_app_ring_light" type="color"/>













  <java-symbol name="system_brand_a_light" type="color"/>













  <java-symbol name="system_brand_b_light" type="color"/>













  <java-symbol name="system_brand_c_light" type="color"/>













  <java-symbol name="system_brand_d_light" type="color"/>













  <java-symbol name="system_under_surface_light" type="color"/>













  <java-symbol name="system_shade_active_light" type="color"/>













  <java-symbol name="system_on_shade_active_light" type="color"/>













  <java-symbol name="system_on_shade_active_variant_light" type="color"/>













  <java-symbol name="system_shade_inactive_light" type="color"/>













  <java-symbol name="system_on_shade_inactive_light" type="color"/>













  <java-symbol name="system_on_shade_inactive_variant_light" type="color"/>













  <java-symbol name="system_shade_disabled_light" type="color"/>













  <java-symbol name="system_overview_background_light" type="color"/>













  <java-symbol name="system_widget_background_dark" type="color"/>













  <java-symbol name="system_clock_hour_dark" type="color"/>













  <java-symbol name="system_clock_minute_dark" type="color"/>













  <java-symbol name="system_clock_second_dark" type="color"/>













  <java-symbol name="system_theme_app_dark" type="color"/>













  <java-symbol name="system_on_theme_app_dark" type="color"/>













  <java-symbol name="system_theme_app_ring_dark" type="color"/>













  <java-symbol name="system_on_theme_app_ring_dark" type="color"/>













  <java-symbol name="system_brand_a_dark" type="color"/>













  <java-symbol name="system_brand_b_dark" type="color"/>













  <java-symbol name="system_brand_c_dark" type="color"/>













  <java-symbol name="system_brand_d_dark" type="color"/>













  <java-symbol name="system_under_surface_dark" type="color"/>













  <java-symbol name="system_shade_active_dark" type="color"/>













  <java-symbol name="system_on_shade_active_dark" type="color"/>













  <java-symbol name="system_on_shade_active_variant_dark" type="color"/>













  <java-symbol name="system_shade_inactive_dark" type="color"/>













  <java-symbol name="system_on_shade_inactive_dark" type="color"/>













  <java-symbol name="system_on_shade_inactive_variant_dark" type="color"/>













  <java-symbol name="system_shade_disabled_dark" type="color"/>













  <java-symbol name="system_overview_background_dark" type="color"/>





























  <java-symbol type="attr" name="actionModeUndoDrawable" />















  <java-symbol type="attr" name="actionModeRedoDrawable" />

















































core/res/res/values/themes_device_defaults.xml



+1122
−0


























File changed.
Preview size limit exceeded, changes collapsed.
























packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt



+1
−1




























Original line number
Diff line number
Diff line








@@ -133,7 +133,7 @@ class ColorScheme(













        @ColorInt seed: Int,















        darkTheme: Boolean,















        style: Style













    ) : this(seed, darkTheme, style, 0.5)













    ) : this(seed, darkTheme, style, 0.0)































    @JvmOverloads















    constructor(