From 868cab175b4f906466c851bc19f3ed03b5bc444b Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 16 Apr 2021 16:09:04 -0700
Subject: [PATCH] Fix errorprone build

=> dialogCornerRadius introduced in v28; this is enforced by errorprone build

Bug: 185623950

Test: manual

Change-Id: I8913cc4645a2f5a26f9b98226ba66f8a8b27c77c
---
 res/drawable-v28/bg_celllayout.xml | 38 ++++++++++++++++++++++++++++++
 res/drawable/bg_celllayout.xml     |  4 ++--
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 res/drawable-v28/bg_celllayout.xml

diff --git a/res/drawable-v28/bg_celllayout.xml b/res/drawable-v28/bg_celllayout.xml
new file mode 100644
index 0000000000..c68bdecc81
--- /dev/null
+++ b/res/drawable-v28/bg_celllayout.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_active="true" >
+        <shape android:shape="rectangle" >
+            <stroke
+                android:width="@dimen/spring_loaded_panel_border"
+                android:color="?android:attr/colorAccent" />
+            <solid android:color="@color/cell_layout_bg_color_active"/>
+            <corners android:radius="?android:attr/dialogCornerRadius" />
+
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/cell_layout_bg_color_inactive"/>
+            <corners android:radius="?android:attr/dialogCornerRadius" />
+        </shape>
+    </item>
+</selector>
diff --git a/res/drawable/bg_celllayout.xml b/res/drawable/bg_celllayout.xml
index 0401c8482b..4e7e82f5f0 100644
--- a/res/drawable/bg_celllayout.xml
+++ b/res/drawable/bg_celllayout.xml
@@ -25,14 +25,14 @@
                 android:width="@dimen/spring_loaded_panel_border"
                 android:color="?android:attr/colorAccent" />
             <solid android:color="@color/cell_layout_bg_color_active"/>
-            <corners android:radius="?android:attr/dialogCornerRadius"></corners>
+            <corners android:radius="@dimen/bg_round_rect_radius" />
 
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle" >
             <solid android:color="@color/cell_layout_bg_color_inactive"/>
-            <corners android:radius="?android:attr/dialogCornerRadius"></corners>
+            <corners android:radius="@dimen/bg_round_rect_radius" />
         </shape>
     </item>
 </selector>