commit e3cc773f0d6f9751f0be3cb249b1881622776d5e
author Linda Tseng <lindatseng@google.com> Tue May 07 18:55:31 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 07 18:55:31 2019 +0000
tree 81b1beb495d785a6b4adbbeec754f48381f8a337
parent 9fcb35a0096d034968087175ad1534269814ffcc
parent 8afc10b3dfeb7c16892d671bd9465d53ccf281a3

Merge "Update SliceViewStyle background color" into qt-dev

res/layout/contextual_slice_full_tile.xml

diff --git a/res/layout/contextual_slice_full_tile.xml b/res/layout/contextual_slice_full_tile.xml
index 8b1ac58..b67b777 100644
--- a/res/layout/contextual_slice_full_tile.xml
+++ b/res/layout/contextual_slice_full_tile.xml
@@ -29,7 +29,7 @@
 
         <androidx.slice.widget.SliceView
             android:id="@+id/slice_view"
-            style="@style/SliceViewStyle"
+            style="@style/ContextualCardSliceViewStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8678e6e..3662fac 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -493,6 +493,10 @@
         <item name="android:paddingEnd">8dp</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>
     </style>