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

Commit 531849ab authored by Evan Laird's avatar Evan Laird
Browse files

Allow corner UI to decouple from rounded_corner_radius 

frameworks/base/core/res/res/dimens value rounded_corner_radius can
change not to reflect the actual device size due to tuning the rounding
on window corners.

This change allows us to decouple corner UI's idea of what the corner
size is from the framework dimension

Bug: 155161607
Test: manual
Change-Id: I6548d74921d6e71250486984869572bdd304b0d0
parent 65225acf

packages/SystemUI/res/values/dimens.xml

+5 −0
Original line number Diff line number Diff line
@@ -1304,4 +1304,9 @@ 


    <!-- Opacity at which the background for the shutdown UI will be drawn. -->

    <item name="shutdown_scrim_behind_alpha" format="float" type="dimen">0.95</item>



    <!--  Allow CornerHandleView and PathSpecCornerPathRenderer to decouple from corner-radius -->

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

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

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

</resources>

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

+3 −3
Original line number Diff line number Diff line
@@ -168,14 +168,14 @@ public class CornerHandleView extends View { 
        // Attempt to get the bottom corner radius, otherwise fall back on the generic or top

        // values. If none are available, use the FALLBACK_RADIUS_DP.

        int radius = getResources().getDimensionPixelSize(

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

                com.android.systemui.R.dimen.config_rounded_mask_size_bottom);

        if (radius == 0) {

            radius = getResources().getDimensionPixelSize(

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

                    com.android.systemui.R.dimen.config_rounded_mask_size);

        }

        if (radius == 0) {

            radius = getResources().getDimensionPixelSize(

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

                    com.android.systemui.R.dimen.config_rounded_mask_size_top);

        }

        if (radius == 0) {

            radius = (int) convertDpToPixel(FALLBACK_RADIUS_DP, mContext);

packages/SystemUI/src/com/android/systemui/assist/ui/DisplayUtils.java

+6 −6
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ public class DisplayUtils { 
    public static int getCornerRadiusBottom(Context context) {

        int radius = 0;



        int resourceId = context.getResources().getIdentifier("rounded_corner_radius_bottom",

                "dimen", "android");

        int resourceId = context.getResources().getIdentifier("config_rounded_mask_size_bottom",

                "dimen", "com.android.systemui");

        if (resourceId > 0) {

            radius = context.getResources().getDimensionPixelSize(resourceId);

        }
@@ -103,8 +103,8 @@ public class DisplayUtils { 
    public static int getCornerRadiusTop(Context context) {

        int radius = 0;



        int resourceId = context.getResources().getIdentifier("rounded_corner_radius_top",

                "dimen", "android");

        int resourceId = context.getResources().getIdentifier("config_rounded_mask_size_top",

                "dimen", "com.android.systemui");

        if (resourceId > 0) {

            radius = context.getResources().getDimensionPixelSize(resourceId);

        }
@@ -118,8 +118,8 @@ public class DisplayUtils { 
    private static int getCornerRadiusDefault(Context context) {

        int radius = 0;



        int resourceId = context.getResources().getIdentifier("rounded_corner_radius", "dimen",

                "android");

        int resourceId = context.getResources().getIdentifier("config_rounded_mask_size",

                "dimen", "com.android.systemui");

        if (resourceId > 0) {

            radius = context.getResources().getDimensionPixelSize(resourceId);

        }

packages/SystemUI/src/com/android/systemui/assist/ui/PathSpecCornerPathRenderer.java

+2 −2

File changed.

Contains only whitespace changes.