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

Commit 01c1d5cb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Correct the cutout of external displays" into udc-qpr-dev am: 30d75658 

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



Change-Id: I841ebf8307e8c505e44738ebae39999db8698025
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13e699df 30d75658

services/core/java/com/android/server/display/LocalDisplayAdapter.java

+8 −4
Original line number Diff line number Diff line
@@ -701,11 +701,15 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
                        maxDisplayMode == null ? mInfo.width : maxDisplayMode.getPhysicalWidth();

                final int maxHeight =

                        maxDisplayMode == null ? mInfo.height : maxDisplayMode.getPhysicalHeight();



                // We cannot determine cutouts and rounded corners of external displays.

                if (mStaticDisplayInfo.isInternal) {

                    mInfo.displayCutout = DisplayCutout.fromResourcesRectApproximation(res,

                            mInfo.uniqueId, maxWidth, maxHeight, mInfo.width, mInfo.height);



                    mInfo.roundedCorners = RoundedCorners.fromResources(

                            res, mInfo.uniqueId, maxWidth, maxHeight, mInfo.width, mInfo.height);

                }



                mInfo.installOrientation = mStaticDisplayInfo.installOrientation;



                mInfo.displayShape = DisplayShape.fromResources(

services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java

+67 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import static org.mockito.Mockito.when; 
import android.content.Context;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.graphics.Rect;

import android.os.Binder;

import android.os.Handler;

import android.os.IBinder;
@@ -1009,6 +1010,72 @@ public class LocalDisplayAdapterTest { 
                0.001f);

    }



    @Test

    public void test_getDisplayDeviceInfoLocked_internalDisplay_usesCutoutAndCorners()

            throws Exception {

        setupCutoutAndRoundedCorners();

        FakeDisplay display = new FakeDisplay(PORT_A);

        display.info.isInternal = true;

        setUpDisplay(display);

        updateAvailableDisplays();

        mAdapter.registerLocked();

        waitForHandlerToComplete(mHandler, HANDLER_WAIT_MS);

        assertThat(mListener.addedDisplays.size()).isEqualTo(1);

        DisplayDevice displayDevice = mListener.addedDisplays.get(0);



        // Turn on / initialize

        Runnable changeStateRunnable = displayDevice.requestDisplayStateLocked(Display.STATE_ON, 0,

                0);

        changeStateRunnable.run();

        waitForHandlerToComplete(mHandler, HANDLER_WAIT_MS);

        mListener.changedDisplays.clear();



        DisplayDeviceInfo info = displayDevice.getDisplayDeviceInfoLocked();



        assertThat(info.displayCutout).isNotNull();

        assertThat(info.displayCutout.getBoundingRectTop()).isEqualTo(new Rect(507, 33, 573, 99));

        assertThat(info.roundedCorners).isNotNull();

        assertThat(info.roundedCorners.getRoundedCorner(0).getRadius()).isEqualTo(5);

    }



    @Test public void test_getDisplayDeviceInfoLocked_externalDisplay_doesNotUseCutoutOrCorners()

            throws Exception {

        setupCutoutAndRoundedCorners();

        FakeDisplay display = new FakeDisplay(PORT_A);

        display.info.isInternal = false;

        setUpDisplay(display);

        updateAvailableDisplays();

        mAdapter.registerLocked();

        waitForHandlerToComplete(mHandler, HANDLER_WAIT_MS);

        assertThat(mListener.addedDisplays.size()).isEqualTo(1);

        DisplayDevice displayDevice = mListener.addedDisplays.get(0);



        // Turn on / initialize

        Runnable changeStateRunnable = displayDevice.requestDisplayStateLocked(Display.STATE_ON, 0,

                0);

        changeStateRunnable.run();

        waitForHandlerToComplete(mHandler, HANDLER_WAIT_MS);

        mListener.changedDisplays.clear();



        DisplayDeviceInfo info = displayDevice.getDisplayDeviceInfoLocked();



        assertThat(info.displayCutout).isNull();

        assertThat(info.roundedCorners).isNull();

    }



    private void setupCutoutAndRoundedCorners() {

        String sampleCutout = "M 507,66\n"

                + "a 33,33 0 1 0 66,0 33,33 0 1 0 -66,0\n"

                + "Z\n"

                + "@left\n";

        // Setup some default cutout

        when(mMockedResources.getString(

                com.android.internal.R.string.config_mainBuiltInDisplayCutout))

                .thenReturn(sampleCutout);

        when(mMockedResources.getDimensionPixelSize(

                com.android.internal.R.dimen.rounded_corner_radius)).thenReturn(5);

    }



    private void assertDisplayDpi(DisplayDeviceInfo info, int expectedPort,

                                  float expectedXdpi,

                                  float expectedYDpi,