Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 52293a0962

Change-Id: I235c1080e4318544bb03b254a26e47dee7f8b8e2
This commit is contained in:
Mill Chen
2019-05-20 06:47:06 -07:00
committed by android-build-merger
parent d4b1d7a6f2 52293a0962
commit f1a92b45e9
7 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/drawable/list_divider_material.xml
View File

@@ -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" />

3
core/res/res/values-night/themes_device_defaults.xml
View File

@@ -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">

4
core/res/res/values/attrs.xml
View File

@@ -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 -->

2
core/res/res/values/colors_device_defaults.xml
View File

@@ -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>

3
core/res/res/values/colors_material.xml
View File

@@ -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>

3
core/res/res/values/themes_device_defaults.xml
View File

@@ -1488,7 +1488,8 @@ easier.
<!-- Progress bar attributes -->
<item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>
<item name="listDivider">@color/list_divider_color_light</item>
<item name="colorListDivider">@color/list_divider_color_light</item>
<item name="opacityListDivider">@color/list_divider_opacity_device_default_light</item>
</style>
<!-- @hide DeviceDefault theme for a window that should use Settings theme colors

4
core/res/res/values/themes_material.xml
View File

@@ -53,6 +53,8 @@ please see themes_device_defaults.xml.
<item name="backgroundDimAmount">0.6</item>
<item name="colorError">@color/error_color_material_dark</item>
<item name="colorPopupBackground">?attr/colorBackground</item>
<item name="colorListDivider">?attr/colorForeground</item>
<item name="opacityListDivider">@color/list_divider_opacity_material</item>
<!-- Text styles -->
<item name="textAppearance">@style/TextAppearance.Material</item>
@@ -424,6 +426,8 @@ please see themes_device_defaults.xml.
<item name="backgroundDimAmount">0.6</item>
<item name="colorError">@color/error_color_material_light</item>
<item name="colorPopupBackground">?attr/colorBackground</item>
<item name="colorListDivider">?attr/colorForeground</item>
<item name="opacityListDivider">@color/list_divider_opacity_material</item>
<!-- Text styles -->
<item name="textAppearance">@style/TextAppearance.Material</item>