Merge "Phase out config_roundedCornerMultipleRadius related config from SystemUI" into tm-dev
This commit is contained in:
@@ -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">
|
||||
|
||||
@@ -169,7 +169,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,
|
||||
|
||||
Reference in New Issue
Block a user