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

Commit ef658582 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove rounded_corner_radius from SystemUI dimens"

parents 358acd58 4d1113d8

packages/SystemUI/res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -861,9 +861,6 @@ 
    <dimen name="bottom_padding">48dp</dimen>

    <dimen name="edge_margin">8dp</dimen>



    <dimen name="rounded_corner_radius">@*android:dimen/rounded_corner_radius</dimen>

    <dimen name="rounded_corner_radius_top">@*android:dimen/rounded_corner_radius_top</dimen>

    <dimen name="rounded_corner_radius_bottom">@*android:dimen/rounded_corner_radius_bottom</dimen>

    <dimen name="rounded_corner_content_padding">0dp</dimen>

    <dimen name="nav_content_padding">0dp</dimen>

    <dimen name="nav_quick_scrub_track_edge_padding">24dp</dimen>

packages/SystemUI/src/com/android/systemui/ScreenDecorations.java

+3 −3
Original line number Diff line number Diff line
@@ -329,11 +329,11 @@ public class ScreenDecorations extends SystemUI implements Tunable { 


    private void updateRoundedCornerRadii() {

        final int newRoundedDefault = mContext.getResources().getDimensionPixelSize(

                R.dimen.rounded_corner_radius);

                com.android.internal.R.dimen.rounded_corner_radius);

        final int newRoundedDefaultTop = mContext.getResources().getDimensionPixelSize(

                R.dimen.rounded_corner_radius_top);

                com.android.internal.R.dimen.rounded_corner_radius_top);

        final int newRoundedDefaultBottom = mContext.getResources().getDimensionPixelSize(

                R.dimen.rounded_corner_radius_bottom);

                com.android.internal.R.dimen.rounded_corner_radius_bottom);



        final boolean roundedCornersChanged = mRoundedDefault != newRoundedDefault

                || mRoundedDefaultBottom != newRoundedDefaultBottom

packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java

+16 −8
Original line number Diff line number Diff line
@@ -134,9 +134,12 @@ public class ScreenDecorationsTest extends SysuiTestCase { 
    public void testNoRounding_NoCutout() {

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.bool.config_fillMainBuiltInDisplayCutout, false);

        mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius, 0);

        mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius_top, 0);

        mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius_bottom, 0);

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.dimen.rounded_corner_radius, 0);

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.dimen.rounded_corner_radius_top, 0);

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.dimen.rounded_corner_radius_bottom, 0);

        mContext.getOrCreateTestableResources()

                .addOverride(dimen.rounded_corner_content_padding, 0);
@@ -153,7 +156,8 @@ public class ScreenDecorationsTest extends SysuiTestCase { 
    public void testRounding() {

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.bool.config_fillMainBuiltInDisplayCutout, false);

        mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius, 20);

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.dimen.rounded_corner_radius, 20);

        mContext.getOrCreateTestableResources()

                .addOverride(dimen.rounded_corner_content_padding, 20);
@@ -173,7 +177,8 @@ public class ScreenDecorationsTest extends SysuiTestCase { 
    public void testCutout() {

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.bool.config_fillMainBuiltInDisplayCutout, true);

        mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius, 0);

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.dimen.rounded_corner_radius, 0);

        mContext.getOrCreateTestableResources()

                .addOverride(dimen.rounded_corner_content_padding, 0);
@@ -186,7 +191,8 @@ public class ScreenDecorationsTest extends SysuiTestCase { 
    public void testDelayedCutout() {

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.bool.config_fillMainBuiltInDisplayCutout, false);

        mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius, 0);

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.dimen.rounded_corner_radius, 0);

        mContext.getOrCreateTestableResources()

                .addOverride(dimen.rounded_corner_content_padding, 0);
@@ -234,12 +240,14 @@ public class ScreenDecorationsTest extends SysuiTestCase { 
    public void testUpdateRoundedCorners() {

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.bool.config_fillMainBuiltInDisplayCutout, false);

        mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius, 20);

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.dimen.rounded_corner_radius, 20);



        mScreenDecorations.start();

        assertEquals(mScreenDecorations.mRoundedDefault, 20);



        mContext.getOrCreateTestableResources().addOverride(dimen.rounded_corner_radius, 5);

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.dimen.rounded_corner_radius, 5);

        mScreenDecorations.onConfigurationChanged(null);

        assertEquals(mScreenDecorations.mRoundedDefault, 5);

    }