Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3884a461 authored by Jason Chang's avatar Jason Chang Committed by Automerger Merge Worker
Browse files

Merge "Phase out config_roundedCornerMultipleRadius related config from... 

Merge "Phase out config_roundedCornerMultipleRadius related config from SystemUI" into tm-dev am: 317a127c am: 6aa75a43

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17821944



Change-Id: I492e69cb602e180d83059ac71b81178a105ae240
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50062a2c 6aa75a43

packages/SystemUI/res/values/config.xml

+0 −14
Original line number Original line Diff line number Diff line
@@ -515,9 +515,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.

    -->

    -->
@@ -662,17 +659,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">

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -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,