Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Phase out config_roundedCornerMultipleRadius related config from SystemUI" into tm-dev

Browse Source
This commit is contained in:
Jason Chang
2022-04-21 06:17:49 +00:00
committed by Android (Google) Code Review
parent bed3aea499 878c61356d
commit 317a127c64
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/res/values/config.xml
View File

@@ -512,9 +512,6 @@
<!-- Flag to turn on the rendering of the above path or not --> <!-- Flag to turn on the rendering of the above path or not -->
<bool name="config_enableDisplayCutoutProtection">false</bool> <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. <!-- 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. 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 --> <!-- Flag to activate notification to contents feature -->
<bool name="config_notificationToContents">true</bool> <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. <!-- The rounded corner drawable for each display in a multi-display device.
{@see com.android.internal.R.array#config_displayUniqueIdArray} --> {@see com.android.internal.R.array#config_displayUniqueIdArray} -->
<array name="config_roundedCornerDrawableArray"> <array name="config_roundedCornerDrawableArray">

1
packages/SystemUI/tests/src/com/android/systemui/decor/RoundedCornerResDelegateTest.kt
View File

@@ -169,7 +169,6 @@ class RoundedCornerResDelegateTest : SysuiTestCase() {
res.addOverride(SystemUIR.array.config_roundedCornerDrawableArray, mockTypedArray) res.addOverride(SystemUIR.array.config_roundedCornerDrawableArray, mockTypedArray)
res.addOverride(SystemUIR.array.config_roundedCornerTopDrawableArray, mockTypedArray) res.addOverride(SystemUIR.array.config_roundedCornerTopDrawableArray, mockTypedArray)
res.addOverride(SystemUIR.array.config_roundedCornerBottomDrawableArray, 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, 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_top, radiusTop ?: 0)
res.addOverride(com.android.internal.R.dimen.rounded_corner_radius_bottom, res.addOverride(com.android.internal.R.dimen.rounded_corner_radius_bottom,