Use the same layout style for contextual cards

Test: manual
Change-Id: I41d86df5147290a17ef698f4f6a192081d1e0742

diff --git a/res/layout/homepage_condition_tile.xml b/res/layout/homepage_condition_tile.xml
index 50ef3c2..9be5c1e 100644 (file)
--- a/res/layout/homepage_condition_tile.xml
+++ b/res/layout/homepage_condition_tile.xml
@@ -17,12 +17,9 @@
 <androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/SuggestionConditionStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardUseCompatPadding="true"
-    app:cardElevation="@dimen/condition_card_elevation"
-    app:cardCornerRadius="@dimen/suggestion_card_corner_radius">
+    style="@style/ContextualCardStyle">
 
     <include layout="@layout/condition_tile"/>
 

diff --git a/res/layout/homepage_slice_tile.xml b/res/layout/homepage_slice_tile.xml
index b947d65..151ad24 100644 (file)
--- a/res/layout/homepage_slice_tile.xml
+++ b/res/layout/homepage_slice_tile.xml
@@ -20,12 +20,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/homepage_card_top_margin"
-    android:layout_marginBottom="@dimen/homepage_card_bottom_margin"
-    android:layout_marginStart="@dimen/homepage_card_side_margin"
-    android:layout_marginEnd="@dimen/homepage_card_side_margin"
-    app:cardCornerRadius="@dimen/homepage_card_corner_radius"
-    app:cardElevation="@dimen/homepage_card_elevation">
+    style="@style/ContextualCardStyle">
 
     <androidx.slice.widget.SliceView
         android:id="@+id/slice_view"

diff --git a/res/values/styles.xml b/res/values/styles.xml
index b096cf8..440f7d0 100644 (file)
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -458,4 +458,13 @@
         <item name="android:paddingBottom">24dp</item>
     </style>
 
+    <style name="ContextualCardStyle">
+        <item name="android:layout_marginTop">@dimen/homepage_card_top_margin</item>
+        <item name="android:layout_marginBottom">@dimen/homepage_card_bottom_margin</item>
+        <item name="android:layout_marginStart">@dimen/homepage_card_side_margin</item>
+        <item name="android:layout_marginEnd">@dimen/homepage_card_side_margin</item>
+        <item name="cardCornerRadius">@dimen/homepage_card_corner_radius</item>
+        <item name="cardElevation">@dimen/homepage_card_elevation</item>
+    </style>
+
 </resources>