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

Commit 24c37642 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Fix rounded corners in transitions on non-internal displays"" into main

parents 5de1b155 2cf79281

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

+9 −1
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 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();
@@ -44,7 +46,13 @@ public class ScreenDecorationsUtils { 
            return 0f;

        }

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

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

        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();

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

        float defaultRadius = RoundedCorners.getRoundedCornerRadius(resources, displayUniqueId)

                - RoundedCorners.getRoundedCornerRadiusAdjustment(resources, displayUniqueId);

packages/SystemUI/tests/src/com/android/systemui/accessibility/FullscreenMagnificationControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ public class FullscreenMagnificationControllerTest extends SysuiTestCase { 
        mContext = spy(mContext);

        Display display = mock(Display.class);

        when(display.getUniqueId()).thenReturn(UNIQUE_DISPLAY_ID_PRIMARY);

        when(display.getType()).thenReturn(Display.TYPE_INTERNAL);

        when(mContext.getDisplayNoVerify()).thenReturn(display);



        // Override the resources to Display Primary
@@ -360,6 +361,7 @@ public class FullscreenMagnificationControllerTest extends SysuiTestCase { 


        Display newDisplay = mock(Display.class);

        when(newDisplay.getUniqueId()).thenReturn(UNIQUE_DISPLAY_ID_SECONDARY);

        when(newDisplay.getType()).thenReturn(Display.TYPE_INTERNAL);

        when(mContext.getDisplayNoVerify()).thenReturn(newDisplay);

        // Override the resources to Display Secondary

        mContext.getOrCreateTestableResources()