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

Commit ef59e5ee authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Fix rounded corners in transitions on non-internal displays" 

This reverts commit 83584cc3.

Reason for revert: Droidmonitor created revert due to b/366525394. Will be verifying through ABTD before submission.

Change-Id: Ia9600561607a2180bcd644c8f816e65e7a7b99ea
parent 83584cc3

core/java/com/android/internal/policy/ScreenDecorationsUtils.java

+1 −9
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ public class ScreenDecorationsUtils { 
     *

     * Note that if the context is not an UI context(not associated with Display), it will use

     * default display.

     *

     * If the associated display is not internal, will return 0.

     */

    public static float getWindowCornerRadius(Context context) {

        final Resources resources = context.getResources();
@@ -46,13 +44,7 @@ public class ScreenDecorationsUtils { 
            return 0f;

        }

        // Use Context#getDisplayNoVerify() in case the context is not an UI context.

        final Display display = context.getDisplayNoVerify();

        // The radius is only valid for internal displays, since the corner radius of external or

        // virtual displays is not known when window corners are configured or are not supported.

        if (display.getType() != Display.TYPE_INTERNAL) {

            return 0f;

        }

        final String displayUniqueId = display.getUniqueId();

        final String displayUniqueId = context.getDisplayNoVerify().getUniqueId();

        // Radius that should be used in case top or bottom aren't defined.

        float defaultRadius = RoundedCorners.getRoundedCornerRadius(resources, displayUniqueId)

                - RoundedCorners.getRoundedCornerRadiusAdjustment(resources, displayUniqueId);