From cac316e6acbf4278bd1cd986f24367a7ed1f6407 Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Tue, 13 Apr 2021 14:42:45 -0400
Subject: [PATCH] Match rounded corners in QSDetail and QSFooter

Fixes: 184706320
Test: manual
Change-Id: If8c48a66412f230724c377b5258268126df76fd1
---
 packages/SystemUI/res/drawable/qs_detail_background.xml       | 4 ++--
 .../res/drawable/qs_footer_action_chip_background.xml         | 4 ++--
 .../drawable/qs_footer_action_chip_background_borderless.xml  | 4 ++--
 packages/SystemUI/res/values/dimens.xml                       | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/SystemUI/res/drawable/qs_detail_background.xml b/packages/SystemUI/res/drawable/qs_detail_background.xml
index 76045e4126cb3..e5c7352807f80 100644
--- a/packages/SystemUI/res/drawable/qs_detail_background.xml
+++ b/packages/SystemUI/res/drawable/qs_detail_background.xml
@@ -18,7 +18,7 @@ Copyright (C) 2014 The Android Open Source Project
         <inset>
             <shape>
                 <solid android:color="@color/qs_detail_transition"/>
-                <corners android:radius="?android:attr/dialogCornerRadius" />
+                <corners android:radius="@dimen/qs_footer_action_corner_radius" />
             </shape>
         </inset>
     </item>
@@ -26,7 +26,7 @@ Copyright (C) 2014 The Android Open Source Project
         <inset>
             <shape>
                 <solid android:color="?android:attr/colorBackgroundFloating"/>
-                <corners android:radius="?android:attr/dialogCornerRadius" />
+                <corners android:radius="@dimen/qs_footer_action_corner_radius" />
             </shape>
         </inset>
     </item>
diff --git a/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml b/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml
index 34675ab891c14..6022206c208cf 100644
--- a/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml
+++ b/packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml
@@ -23,14 +23,14 @@
         <item android:id="@android:id/mask">
             <shape android:shape="rectangle">
                 <solid android:color="@android:color/white"/>
-                <corners android:radius="@dimen/screenshot_button_corner_radius"/>
+                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
             </shape>
         </item>
         <item>
             <shape android:shape="rectangle">
             <stroke android:width="1dp" android:color="@color/qs_footer_action_border"/>
                 <solid android:color="@android:color/transparent"/>
-                <corners android:radius="@dimen/screenshot_button_corner_radius"/>
+                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
             </shape>
         </item>
     </ripple>
diff --git a/packages/SystemUI/res/drawable/qs_footer_action_chip_background_borderless.xml b/packages/SystemUI/res/drawable/qs_footer_action_chip_background_borderless.xml
index 596ed711dd437..bbcfb15d9226d 100644
--- a/packages/SystemUI/res/drawable/qs_footer_action_chip_background_borderless.xml
+++ b/packages/SystemUI/res/drawable/qs_footer_action_chip_background_borderless.xml
@@ -22,13 +22,13 @@
         <item android:id="@android:id/mask">
             <shape android:shape="rectangle">
                 <solid android:color="@android:color/white"/>
-                <corners android:radius="@dimen/screenshot_button_corner_radius"/>
+                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
             </shape>
         </item>
         <item>
             <shape android:shape="rectangle">
                 <solid android:color="@android:color/transparent"/>
-                <corners android:radius="@dimen/screenshot_button_corner_radius"/>
+                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>
             </shape>
         </item>
     </ripple>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 433e1bea28b57..8492a31bed001 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -412,6 +412,8 @@
     <!-- The size of each of the icon buttons in the QS footer -->
     <dimen name="qs_footer_action_button_size">@dimen/qs_footer_height</dimen>
 
+    <dimen name="qs_footer_action_corner_radius">20dp</dimen>
+
     <!-- (48dp - 44dp) / 2 -->
     <dimen name="qs_footer_action_inset">2dp</dimen>