Merge branch 'dev' into separate-gesture-options
This commit is contained in:
commit
97555645f8
38 changed files with 1340 additions and 313 deletions
|
|
@ -37,7 +37,7 @@
|
|||
<attr name="ic_backup" format="reference"/>
|
||||
<attr name="ic_add" format="reference"/>
|
||||
|
||||
<!-- Can't refer to colors directly into drawable's xml-->
|
||||
<!-- Can't refer to colors directly in drawable's xml-->
|
||||
<attr name="toolbar_shadow_drawable" format="reference"/>
|
||||
<attr name="selector_drawable" format="reference"/>
|
||||
<attr name="checked_selector_drawable" format="reference"/>
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@
|
|||
<color name="black_contrast_background_color">#23454545</color>
|
||||
|
||||
<!-- Miscellaneous -->
|
||||
<color name="drawer_header_font_color">#ddffffff</color>
|
||||
<color name="duration_background_color">#aa000000</color>
|
||||
<color name="live_duration_background_color">#c8E53935</color>
|
||||
<color name="playlist_stream_count_background_color">#e6000000</color>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue