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

Commit c16a501b authored by Graciela Putri's avatar Graciela Putri Committed by Android (Google) Code Review
Browse files

Merge "Stub isUserAppAspectRatioSettingsEnabled" into udc-qpr-dev

parents 025a384f b8027a34

services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -2404,8 +2404,9 @@ public class SizeCompatTests extends WindowTestsBase { 
                .setUid(android.os.Process.myUid())

                .setUid(android.os.Process.myUid())

                .build();

                .build();

        activity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);

        activity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);

        activity.mWmService.mLetterboxConfiguration

        spyOn(activity.mWmService.mLetterboxConfiguration);

                .setUserAppAspectRatioSettingsOverrideEnabled(enabled);

        doReturn(enabled).when(activity.mWmService.mLetterboxConfiguration)

                .isUserAppAspectRatioSettingsEnabled();

        // Set user aspect ratio override

        // Set user aspect ratio override

        final IPackageManager pm = mAtm.getPackageManager();

        final IPackageManager pm = mAtm.getPackageManager();

        try {

        try {
@@ -4244,6 +4245,7 @@ public class SizeCompatTests extends WindowTestsBase { 
        // Set up a display in landscape with a fixed-orientation PORTRAIT app

        // Set up a display in landscape with a fixed-orientation PORTRAIT app

        setUpDisplaySizeWithApp(2800, 1400);

        setUpDisplaySizeWithApp(2800, 1400);

        mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);

        mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);

        mWm.mLetterboxConfiguration.setIsAutomaticReachabilityInBookModeEnabled(false);

        mWm.mLetterboxConfiguration.setLetterboxHorizontalPositionMultiplier(0.5f);

        mWm.mLetterboxConfiguration.setLetterboxHorizontalPositionMultiplier(0.5f);

        prepareUnresizable(mActivity, 1.75f, SCREEN_ORIENTATION_PORTRAIT);

        prepareUnresizable(mActivity, 1.75f, SCREEN_ORIENTATION_PORTRAIT);