Merge "Add ShapeDrawable to card ripple backgrounds." into androidx-master-dev

diff --git a/car/core/res/drawable/car_card_ripple_background.xml b/car/core/res/drawable/car_card_ripple_background.xml
index ca20e0f..51e3ef9 100644
--- a/car/core/res/drawable/car_card_ripple_background.xml
+++ b/car/core/res/drawable/car_card_ripple_background.xml

@@ -17,7 +17,9 @@
 <ripple
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="@color/car_card_ripple_background">
-    <item
-        android:id="@android:id/mask"
-        android:drawable="@android:color/white" />
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
 </ripple>

diff --git a/car/core/res/drawable/car_card_ripple_background_dark.xml b/car/core/res/drawable/car_card_ripple_background_dark.xml
index 880ff7a..031d495 100644
--- a/car/core/res/drawable/car_card_ripple_background_dark.xml
+++ b/car/core/res/drawable/car_card_ripple_background_dark.xml

@@ -17,7 +17,9 @@
 <ripple
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="@color/car_card_ripple_background_dark">
-    <item
-        android:id="@android:id/mask"
-        android:drawable="@android:color/white" />
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
 </ripple>

diff --git a/car/core/res/drawable/car_card_ripple_background_light.xml b/car/core/res/drawable/car_card_ripple_background_light.xml
index 5d4f2c6..a0fb41f 100644
--- a/car/core/res/drawable/car_card_ripple_background_light.xml
+++ b/car/core/res/drawable/car_card_ripple_background_light.xml

@@ -17,7 +17,9 @@
 <ripple
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="@color/car_card_ripple_background_light">
-    <item
-        android:id="@android:id/mask"
-        android:drawable="@android:color/white" />
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
 </ripple>