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

Commit 51499a09 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Add missing attrs to Theme.DeviceDefault 

Fixes: 184900666
Test: make
Change-Id: I5a484826fc865721a05d99c1781bad5c7842ea8c
parent 9759067e

core/res/res/color/surface_highlight_dark.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="@color/system_neutral1_500" lStar="35" />

</selector>

core/res/res/color/surface_light.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2020 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="@color/system_neutral1_500" lStar="97" />

</selector>

core/res/res/values/attrs.xml

+21 −0
Original line number Diff line number Diff line
@@ -1134,6 +1134,15 @@ 
        <!-- Tertiary accent color used on Material NEXT buttons. @hide -->

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













        <!-- Darker accent color used on Material NEXT buttons. @hide -->













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

























        <!-- Secondary darker accent color used on Material NEXT buttons. @hide -->













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

























        <!-- Tertiary darker accent color used on Material NEXT buttons. @hide -->













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



























        <!-- The color applied to framework controls in their normal state. -->















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























@@ -1155,6 +1164,18 @@













        <!-- The color applied to the edge effect on scrolling containers. -->















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



























        <!-- The color applied to surfaces on top of colorBackground. @hide -->













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

























        <!-- Alternative color applied to surfaces on top of colorBackground. @hide -->













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

























        <!-- Alternative color applied to surfaces on top of colorBackground. @hide -->













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

























        <!-- Alternative color applied to surfaces on top of colorBackground. @hide -->













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



























        <!-- The type of the edge effect. The default is glow. -->















        <attr name="edgeEffectType">















            <!-- Use a colored glow at the edge. -->

































core/res/res/values/colors_device_defaults.xml



+19
−3




























Original line number
Diff line number
Diff line








@@ -25,14 +25,13 @@













    <color name="primary_dark_device_default_light">@color/primary_device_default_light</color>















    <color name="primary_dark_device_default_settings">@color/primary_device_default_dark</color>















    <color name="primary_dark_device_default_settings_light">@color/primary_device_default_light</color>



























    <color name="navigation_bar_divider_device_default_settings">#1f000000</color>





























    <color name="secondary_device_default_settings">@color/secondary_material_settings</color>















    <color name="secondary_device_default_settings_light">@color/secondary_material_settings_light</color>















    <color name="tertiary_device_default_settings">@color/tertiary_material_settings</color>















    <color name="quaternary_device_default_settings">@color/quaternary_material_settings</color>













    <color name="navigation_bar_divider_device_default_settings">#1f000000</color>





























    <!--  Accent colors  -->















    <color name="accent_device_default_light">@color/system_accent1_600</color>















    <color name="accent_device_default_dark">@color/system_accent1_200</color>















    <color name="accent_device_default">@color/accent_device_default_light</color>









@@ -40,11 +39,28 @@













    <color name="accent_secondary_device_default">@color/system_accent2_100</color>















    <color name="accent_tertiary_device_default">@color/system_accent3_100</color>





























    <!-- Accent variants -->













    <color name="accent_primary_variant_light_device_default">@color/system_accent1_600</color>













    <color name="accent_secondary_variant_light_device_default">@color/system_accent2_600</color>













    <color name="accent_tertiary_variant_light_device_default">@color/system_accent3_600</color>













    <color name="accent_primary_variant_dark_device_default">@color/system_accent1_300</color>













    <color name="accent_secondary_variant_dark_device_default">@color/system_accent2_300</color>













    <color name="accent_tertiary_variant_dark_device_default">@color/system_accent3_300</color>



























    <!-- Background colors -->















    <color name="background_device_default_dark">@color/system_neutral1_800</color>















    <color name="background_device_default_light">@color/system_neutral1_50</color>















    <color name="background_floating_device_default_dark">@color/system_neutral1_900</color>















    <color name="background_floating_device_default_light">@color/system_neutral1_100</color>





























    <!-- Surface colors -->













    <color name="surface_header_dark">@color/system_neutral1_700</color>













    <color name="surface_header_light">@color/system_neutral1_100</color>













    <color name="surface_variant_dark">@color/system_neutral1_700</color>













    <color name="surface_variant_light">@color/system_neutral2_100</color>













    <color name="surface_dark">@color/system_neutral1_800</color>













    <color name="surface_highlight_light">@color/system_neutral1_0</color>





























    <!-- Please refer to text_color_[primary]_device_default_[light].xml for text colors-->















    <color name="foreground_device_default_light">@color/text_color_primary_device_default_light</color>















    <color name="foreground_device_default_dark">@color/text_color_primary_device_default_dark</color>

































core/res/res/values/symbols.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -4220,6 +4220,10 @@













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















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















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













  <java-symbol type="attr" name="colorSurface" format="color" />













  <java-symbol type="attr" name="colorSurfaceHighlight" format="color" />













  <java-symbol type="attr" name="colorSurfaceVariant" format="color" />













  <java-symbol type="attr" name="colorSurfaceHeader" format="color" />































  <!-- CEC Configuration -->















  <java-symbol type="bool" name="config_cecHdmiCecEnabled_userConfigurable" />