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

Commit f1a92b45 authored by Mill Chen's avatar Mill Chen Committed by android-build-merger
Browse files

Merge "Add 2 attributes for list_divider_material" into qt-dev 

am: 52293a09

Change-Id: I235c1080e4318544bb03b254a26e47dee7f8b8e2
parents d4b1d7a6 52293a09

core/res/res/drawable/list_divider_material.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
-->



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

       android:tint="?attr/colorForeground">

    <solid android:color="#1f000000" />

       android:tint="?attr/colorListDivider">

    <solid android:color="?attr/opacityListDivider" />

    <size

        android:height="1dp"

        android:width="1dp" />

core/res/res/values-night/themes_device_defaults.xml

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ easier. 
        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>

        <item name="colorBackground">@color/primary_dark_device_default_settings</item>



        <item name="listDivider">@color/list_divider_color_dark</item>

        <item name="colorListDivider">@color/list_divider_color_dark</item>

        <item name="opacityListDivider">@color/list_divider_opacity_device_default_dark</item>

    </style>



    <style name="Theme.DeviceDefault.Settings.DialogBase" parent="Theme.Material.BaseDialog">

core/res/res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ 
        <attr name="backgroundDimEnabled" format="boolean" />

        <!-- Color of background imagery used for popup windows. -->

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

        <!-- Color used for list divider. -->

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

        <!-- Opacity used for list divider. -->

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



        <!-- =========== -->

        <!-- Text styles -->

core/res/res/values/colors_device_defaults.xml

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ 


    <color name="list_divider_color_light">#ffdadce0</color>

    <color name="list_divider_color_dark">#85ffffff</color>

    <color name="list_divider_opacity_device_default_light">@android:color/white</color>

    <color name="list_divider_opacity_device_default_dark">@android:color/white</color>

    <color name="loading_gradient_background_color_dark">#2D3033</color>

    <color name="loading_gradient_background_color_light">#DADCE0</color>

    <color name="loading_gradient_highlight_color_dark">#3C4043</color>

core/res/res/values/colors_material.xml

+3 −0
Original line number Diff line number Diff line
@@ -149,4 +149,7 @@ 
    <color name="autofill_background_material_dark">@color/material_blue_grey_900</color>

    <color name="autofill_background_material_light">@color/material_grey_50</color>



    <!-- List divider opacity -->

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



</resources>