Merge "Update SliceViewStyle background color" into qt-dev

am: e3cc773f0d

Change-Id: Ic06293093bbee095d110d67cbedf935a35e4618d
This commit is contained in:
Linda Tseng
2019-05-07 12:56:20 -07:00
committed by android-build-merger
2 changed files with 5 additions and 1 deletions

View File

@@ -29,7 +29,7 @@
<androidx.slice.widget.SliceView <androidx.slice.widget.SliceView
android:id="@+id/slice_view" android:id="@+id/slice_view"
style="@style/SliceViewStyle" style="@style/ContextualCardSliceViewStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"

View File

@@ -493,6 +493,10 @@
<item name="android:paddingEnd">8dp</item> <item name="android:paddingEnd">8dp</item>
<item name="rowStyle">@style/SliceRowStyle</item> <item name="rowStyle">@style/SliceRowStyle</item>
<item name="android:background">?android:attr/colorBackgroundFloating</item>
</style>
<style name="ContextualCardSliceViewStyle" parent="SliceViewStyle">
<item name="android:background">@color/contextual_card_background</item> <item name="android:background">@color/contextual_card_background</item>
</style> </style>