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

Commit 442eed75 authored by Mina Granic's avatar Mina Granic
Browse files

Respect camera compat aspect ratio in freeform when requested. 

Camera Compat for Freeform applies aspect ratio to avoid stretching
issues.

Flag: com.android.window.flags.enable_camera_compat_for_desktop_windowing
Fixes: 392103971
Test: atest WmTests:SizeCompatTests
Change-Id: I1b6840259e908f6d724cf34e491be6bf1cd5d485
parent d501cec0

services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java

+6 −1
Original line number Diff line number Diff line
@@ -295,9 +295,14 @@ class AppCompatAspectRatioPolicy { 
                // {@link ActivityRecord#shouldCreateAppCompatDisplayInsets()} will be false for

                // both activities that are naturally resizeable and activities that have been

                // forced resizeable.

                // Camera compat mode is an exception to this, where the activity is letterboxed

                // to an aspect ratio commonly found on phones, e.g. 16:9, to avoid issues like

                // stretching of the camera preview.

                || (Flags.ignoreAspectRatioRestrictionsForResizeableFreeformActivities()

                    && task.getWindowingMode() == WINDOWING_MODE_FREEFORM

                    && !mActivityRecord.shouldCreateAppCompatDisplayInsets())) {

                    && !mActivityRecord.shouldCreateAppCompatDisplayInsets()

                    && !AppCompatCameraPolicy.shouldCameraCompatControlAspectRatio(

                            mActivityRecord))) {

            return false;

        }

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

+16 −8
Original line number Diff line number Diff line
@@ -4914,7 +4914,8 @@ public class SizeCompatTests extends WindowTestsBase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableFlags({Flags.FLAG_IGNORE_ASPECT_RATIO_RESTRICTIONS_FOR_RESIZEABLE_FREEFORM_ACTIVITIES,

            Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING})

    public void testCameraCompatAspectRatioAppliedForFixedOrientationCameraActivities() {

        // Needed to create camera compat policy in DisplayContent.

        allowDesktopMode();
@@ -4926,7 +4927,8 @@ public class SizeCompatTests extends WindowTestsBase { 
        setupCameraCompatAspectRatio(cameraCompatAspectRatio, display);



        // Create task on test display.

        final Task task = new TaskBuilder(mSupervisor).setDisplay(display).build();

        final Task task = new TaskBuilder(mSupervisor).setDisplay(display)

                .setWindowingMode(WINDOWING_MODE_FREEFORM).build();



        // Create fixed portrait activity.

        final ActivityRecord fixedOrientationActivity = new ActivityBuilder(mAtm)
@@ -4939,7 +4941,8 @@ public class SizeCompatTests extends WindowTestsBase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableFlags({Flags.FLAG_IGNORE_ASPECT_RATIO_RESTRICTIONS_FOR_RESIZEABLE_FREEFORM_ACTIVITIES,

            Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING})

    public void testCameraCompatAspectRatioForFixedOrientationCameraActivitiesPortraitWindow() {

        // Needed to create camera compat policy in DisplayContent.

        allowDesktopMode();
@@ -4951,7 +4954,8 @@ public class SizeCompatTests extends WindowTestsBase { 
        setupCameraCompatAspectRatio(cameraCompatAspectRatio, display);



        // Create task on test display.

        final Task task = new TaskBuilder(mSupervisor).setDisplay(display).build();

        final Task task = new TaskBuilder(mSupervisor).setDisplay(display)

                .setWindowingMode(WINDOWING_MODE_FREEFORM).build();



        // Create fixed portrait activity.

        final ActivityRecord fixedOrientationActivity = new ActivityBuilder(mAtm)
@@ -4964,7 +4968,8 @@ public class SizeCompatTests extends WindowTestsBase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableFlags({Flags.FLAG_IGNORE_ASPECT_RATIO_RESTRICTIONS_FOR_RESIZEABLE_FREEFORM_ACTIVITIES,

            Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING})

    public void testCameraCompatAspectRatioAppliedInsteadOfDefaultAspectRatio() {

        // Needed to create camera compat policy in DisplayContent.

        allowDesktopMode();
@@ -4976,7 +4981,8 @@ public class SizeCompatTests extends WindowTestsBase { 
        setupCameraCompatAspectRatio(cameraCompatAspectRatio, display);



        // Create task on test display.

        final Task task = new TaskBuilder(mSupervisor).setDisplay(display).build();

        final Task task = new TaskBuilder(mSupervisor).setDisplay(display)

                .setWindowingMode(WINDOWING_MODE_FREEFORM).build();



        // App's target min aspect ratio - this should not be used, as camera controls aspect ratio.

        final float targetMinAspectRatio = 4.0f;
@@ -4993,7 +4999,8 @@ public class SizeCompatTests extends WindowTestsBase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    @EnableFlags({Flags.FLAG_IGNORE_ASPECT_RATIO_RESTRICTIONS_FOR_RESIZEABLE_FREEFORM_ACTIVITIES,

            Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING})

    public void testCameraCompatAspectRatio_defaultAspectRatioAppliedWhenGreater() {

        // Needed to create camera compat policy in DisplayContent.

        allowDesktopMode();
@@ -5005,7 +5012,8 @@ public class SizeCompatTests extends WindowTestsBase { 
        setupCameraCompatAspectRatio(cameraCompatAspectRatio, display);



        // Create task on test display.

        final Task task = new TaskBuilder(mSupervisor).setDisplay(display).build();

        final Task task = new TaskBuilder(mSupervisor).setDisplay(display)

                .setWindowingMode(WINDOWING_MODE_FREEFORM).build();



        // App's target min aspect ratio bigger than camera compat aspect ratio - use that instead.

        final float targetMinAspectRatio = 6.0f;