From 878c61356d5a6ffec199b52306ccec4eb19ab836 Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Tue, 19 Apr 2022 18:09:48 +0800
Subject: [PATCH] Phase out config_roundedCornerMultipleRadius related config
 from SystemUI

Remove config_roundedCornerMultipleRadius,
config_roundedCornerMultipleRadiusSecondary
and config_roundedCornerMultipleRadiusArray config from SystemUI.

Bug: 224688507

Test: Build ROM and pass presubmit test
Test: atest SystemUITests
Change-Id: I2263420c2c9c27a163fd04003015079407b5c9cd
---
 packages/SystemUI/res/values/config.xml            | 14 --------------
 .../systemui/decor/RoundedCornerResDelegateTest.kt |  1 -
 2 files changed, 15 deletions(-)

diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index ae5b8d8ae451a..83b1b52fff3db 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -512,9 +512,6 @@
     <!--  Flag to turn on the rendering of the above path or not  -->
     <bool name="config_enableDisplayCutoutProtection">false</bool>
 
-    <!-- Respect drawable/rounded.xml intrinsic size for multiple radius corner path customization -->
-    <bool name="config_roundedCornerMultipleRadius">false</bool>
-
     <!-- Controls can query 2 preferred applications for limited number of suggested controls.
          This config value should contain a list of package names of thoses preferred applications.
     -->
@@ -659,17 +656,6 @@
     <!-- Flag to activate notification to contents feature -->
     <bool name="config_notificationToContents">true</bool>
 
-    <!-- Respect drawable/rounded_secondary.xml intrinsic size for multiple radius corner path
-         customization for secondary display-->
-    <bool name="config_roundedCornerMultipleRadiusSecondary">false</bool>
-
-    <!-- Whether the rounded corners are multiple radius for each display in a multi-display device.
-         {@see com.android.internal.R.array#config_displayUniqueIdArray} -->
-    <array name="config_roundedCornerMultipleRadiusArray">
-        <item>@bool/config_roundedCornerMultipleRadius</item>
-        <item>@bool/config_roundedCornerMultipleRadiusSecondary</item>
-    </array>
-
     <!-- The rounded corner drawable for each display in a multi-display device.
          {@see com.android.internal.R.array#config_displayUniqueIdArray} -->
     <array name="config_roundedCornerDrawableArray">
diff --git a/packages/SystemUI/tests/src/com/android/systemui/decor/RoundedCornerResDelegateTest.kt b/packages/SystemUI/tests/src/com/android/systemui/decor/RoundedCornerResDelegateTest.kt
index f629b3b9b97a3..0da90edd54eb4 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/decor/RoundedCornerResDelegateTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/decor/RoundedCornerResDelegateTest.kt
@@ -153,7 +153,6 @@ class RoundedCornerResDelegateTest : SysuiTestCase() {
             res.addOverride(SystemUIR.array.config_roundedCornerDrawableArray, mockTypedArray)
             res.addOverride(SystemUIR.array.config_roundedCornerTopDrawableArray, mockTypedArray)
             res.addOverride(SystemUIR.array.config_roundedCornerBottomDrawableArray, mockTypedArray)
-            res.addOverride(SystemUIR.array.config_roundedCornerMultipleRadiusArray, mockTypedArray)
             res.addOverride(com.android.internal.R.dimen.rounded_corner_radius, radius ?: 0)
             res.addOverride(com.android.internal.R.dimen.rounded_corner_radius_top, radiusTop ?: 0)
             res.addOverride(com.android.internal.R.dimen.rounded_corner_radius_bottom,