Merge "Change color of background for popup window" into qt-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
2e6c004383
@@ -20,6 +20,6 @@
|
||||
<corners
|
||||
android:radius="2dp" />
|
||||
<solid
|
||||
android:color="?attr/colorBackground" />
|
||||
android:color="?attr/colorPopupBackground" />
|
||||
|
||||
</shape>
|
||||
|
||||
@@ -87,6 +87,8 @@
|
||||
theme does not set this value, meaning it is based on whether the
|
||||
window is floating. -->
|
||||
<attr name="backgroundDimEnabled" format="boolean" />
|
||||
<!-- Color of background imagery used for popup windows. -->
|
||||
<attr name="colorPopupBackground" format="color" />
|
||||
|
||||
<!-- =========== -->
|
||||
<!-- Text styles -->
|
||||
|
||||
@@ -216,6 +216,7 @@ easier.
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorPopupBackground">?attr/colorBackgroundFloating</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.DeviceDefault" parent="Theme.DeviceDefaultBase" />
|
||||
@@ -943,6 +944,7 @@ easier.
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
<item name="colorError">@color/error_color_device_default_light</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_light</item>
|
||||
<item name="colorPopupBackground">?attr/colorBackgroundFloating</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an
|
||||
|
||||
@@ -52,6 +52,7 @@ please see themes_device_defaults.xml.
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_material_dark</item>
|
||||
<item name="backgroundDimAmount">0.6</item>
|
||||
<item name="colorError">@color/error_color_material_dark</item>
|
||||
<item name="colorPopupBackground">?attr/colorBackground</item>
|
||||
|
||||
<!-- Text styles -->
|
||||
<item name="textAppearance">@style/TextAppearance.Material</item>
|
||||
@@ -422,6 +423,7 @@ please see themes_device_defaults.xml.
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_material_light</item>
|
||||
<item name="backgroundDimAmount">0.6</item>
|
||||
<item name="colorError">@color/error_color_material_light</item>
|
||||
<item name="colorPopupBackground">?attr/colorBackground</item>
|
||||
|
||||
<!-- Text styles -->
|
||||
<item name="textAppearance">@style/TextAppearance.Material</item>
|
||||
|
||||
Reference in New Issue
Block a user