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

Commit 70c9d697 authored by Milton Wu's avatar Milton Wu Committed by Automerger Merge Worker
Browse files

Merge "Revert "Support tuning sysui_rounded_size"" into tm-dev am: 8eb1c121 

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

Change-Id: I783263bb0c2b51f9d24686d819bde11f10bc032a
parents 1316b64f 8eb1c121

packages/SystemUI/src/com/android/systemui/decor/RoundedCornerResDelegate.kt

+5 −6
Original line number Diff line number Diff line
@@ -125,18 +125,17 @@ class RoundedCornerResDelegate( 
            bottomRoundedSize = Size(bottomRadius, bottomRadius)

        }



        if (roundedSizeFactor != null && roundedSizeFactor > 0) {

            val length: Int = (roundedSizeFactor * density).toInt()

            roundedSize = Size(length, length)

        }



        if (topRoundedSize.width == 0) {

            topRoundedSize = roundedSize

        }

        if (bottomRoundedSize.width == 0) {

            bottomRoundedSize = roundedSize

        }



        if (roundedSizeFactor != null && roundedSizeFactor > 0) {

            val length: Int = (roundedSizeFactor * density).toInt()

            topRoundedSize = Size(length, length)

            bottomRoundedSize = Size(length, length)

        }

    }



    fun updateTuningSizeFactor(factor: Int?, newReloadToken: Int) {

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

+6 −2
Original line number Diff line number Diff line
@@ -102,9 +102,8 @@ class RoundedCornerResDelegateTest : SysuiTestCase() { 
    fun testUpdateTuningSizeFactor() {

        mContext.orCreateTestableResources.addOverrides(

                mockTypeArray = mockTypedArray,

                radius = 1,

                radiusTop = 0,

                radiusBottom = 2,

                radiusBottom = 0,

                multipleRadius = false)



        roundedCornerResDelegate = RoundedCornerResDelegate(mContext.resources, null)
@@ -116,6 +115,11 @@ class RoundedCornerResDelegateTest : SysuiTestCase() { 
        assertEquals(Size(length, length), roundedCornerResDelegate.topRoundedSize)

        assertEquals(Size(length, length), roundedCornerResDelegate.bottomRoundedSize)



        mContext.orCreateTestableResources.addOverrides(

                mockTypeArray = mockTypedArray,

                radiusTop = 1,

                radiusBottom = 2,

                multipleRadius = false)

        roundedCornerResDelegate.updateTuningSizeFactor(null, 2)



        assertEquals(Size(1, 1), roundedCornerResDelegate.topRoundedSize)