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

Commit dbd38b63 authored by Mina Granic's avatar Mina Granic Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "[1/n] Camera Compat Freeform: per-app controls for disabling... 

Merge "Revert^2 "[1/n] Camera Compat Freeform: per-app controls for disabling the treatment."" into main
parents 765197fc 1e2d5cc2

core/java/android/content/pm/ActivityInfo.java

+20 −0
Original line number Diff line number Diff line
@@ -1279,6 +1279,26 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { 
    public static final long OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE =

            264301586L; // buganizer id



    /**

     * Excludes the packages the override is applied to from the camera compatibility treatment

     * in free-form windowing mode for fixed-orientation apps.

     *

     * <p>In free-form windowing mode, the compatibility treatment emulates running on a portrait

     * device by letterboxing the app window and changing the camera characteristics to what apps

     * commonly expect in a portrait device: 90 and 270 degree sensor rotation for back and front

     * cameras, respectively, and setting display rotation to 0.

     *

     * <p>Use this flag to disable the compatibility treatment for apps that do not respond well to

     * the treatment.

     *

     * @hide

     */

    @ChangeId

    @Overridable

    @Disabled

    public static final long OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT =

            314961188L;



    /**

     * This change id forces the packages it is applied to sandbox {@link android.view.View} API to

     * an activity bounds for:

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

+21 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.content.pm.ActivityInfo.FORCE_RESIZE_APP; 
import static android.content.pm.ActivityInfo.OVERRIDE_ANY_ORIENTATION;

import static android.content.pm.ActivityInfo.OVERRIDE_ANY_ORIENTATION_TO_USER;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_FORCE_ROTATION;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_REFRESH;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE;

import static android.content.pm.ActivityInfo.OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS;
@@ -130,6 +131,7 @@ import com.android.internal.statusbar.LetterboxDetails; 
import com.android.server.wm.LetterboxConfiguration.LetterboxBackgroundType;

import com.android.server.wm.utils.OptPropFactory;

import com.android.server.wm.utils.OptPropFactory.OptProp;

import com.android.window.flags.Flags;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -350,7 +352,6 @@ final class LetterboxUiController { 
                isCompatChangeEnabled(OVERRIDE_ORIENTATION_ONLY_FOR_CAMERA);

        mIsOverrideRespectRequestedOrientationEnabled =

                isCompatChangeEnabled(OVERRIDE_RESPECT_REQUESTED_ORIENTATION);



    }



    /** Cleans up {@link Letterbox} if it exists.*/
@@ -714,6 +715,25 @@ final class LetterboxUiController { 
                isCompatChangeEnabled(OVERRIDE_CAMERA_COMPAT_DISABLE_FORCE_ROTATION));

    }



    /**

     * Whether activity is eligible for camera compatibility free-form treatment.

     *

     * <p>The treatment is applied to a fixed-orientation camera activity in free-form windowing

     * mode. The treatment letterboxes or pillarboxes the activity to the expected orientation and

     * provides changes to the camera and display orientation signals to match those expected on a

     * portrait device in that orientation (for example, on a standard phone).

     *

     * <p>The treatment is enabled when the following conditions are met:

     * <ul>

     * <li>Property gating the camera compatibility free-form treatment is enabled.

     * <li>Activity isn't opted out by the device manufacturer with override.

     * </ul>

     */

    boolean shouldApplyFreeformTreatmentForCameraCompat() {

        return Flags.cameraCompatForFreeform() && !isCompatChangeEnabled(

                        OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT);

    }



    private boolean isCameraCompatTreatmentActive() {

        DisplayContent displayContent = mActivityRecord.mDisplayContent;

        if (displayContent == null) {

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

+47 −6
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.content.pm.ActivityInfo.FORCE_RESIZE_APP; 
import static android.content.pm.ActivityInfo.OVERRIDE_ANY_ORIENTATION;

import static android.content.pm.ActivityInfo.OVERRIDE_ANY_ORIENTATION_TO_USER;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_FORCE_ROTATION;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_DISABLE_REFRESH;

import static android.content.pm.ActivityInfo.OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE;

import static android.content.pm.ActivityInfo.OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS;
@@ -63,6 +64,7 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock; 
import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;

import static com.android.server.wm.LetterboxUiController.MIN_COUNT_TO_IGNORE_REQUEST_IN_LOOP;

import static com.android.server.wm.LetterboxUiController.SET_ORIENTATION_REQUEST_COUNTER_TIMEOUT_MS;

import static com.android.window.flags.Flags.FLAG_CAMERA_COMPAT_FOR_FREEFORM;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;
@@ -466,6 +468,44 @@ public class LetterboxUiControllerTest extends WindowTestsBase { 
        assertTrue(mController.shouldForceRotateForCameraCompat());

    }



    // shouldApplyFreeformTreatmentForCameraCompat



    @Test

    public void testShouldApplyCameraCompatFreeformTreatment_flagIsDisabled_returnsFalse() {

        mSetFlagsRule.disableFlags(FLAG_CAMERA_COMPAT_FOR_FREEFORM);



        assertFalse(mController.shouldApplyFreeformTreatmentForCameraCompat());

    }



    @Test

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testShouldApplyCameraCompatFreeformTreatment_overrideEnabled_returnsFalse() {

        mSetFlagsRule.enableFlags(FLAG_CAMERA_COMPAT_FOR_FREEFORM);



        assertFalse(mController.shouldApplyFreeformTreatmentForCameraCompat());

    }



    @Test

    @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_DISABLE_FREEFORM_WINDOWING_TREATMENT})

    public void testShouldApplyCameraCompatFreeformTreatment_disabledByOverride_returnsFalse()

            throws Exception {

        mSetFlagsRule.enableFlags(FLAG_CAMERA_COMPAT_FOR_FREEFORM);



        mController = new LetterboxUiController(mWm, mActivity);



        assertFalse(mController.shouldApplyFreeformTreatmentForCameraCompat());

    }



    @Test

    public void testShouldApplyCameraCompatFreeformTreatment_notDisabledByOverride_returnsTrue()

            throws Exception {

        mSetFlagsRule.enableFlags(FLAG_CAMERA_COMPAT_FOR_FREEFORM);



        mController = new LetterboxUiController(mWm, mActivity);



        assertTrue(mController.shouldApplyFreeformTreatmentForCameraCompat());

    }



    @Test

    public void testGetCropBoundsIfNeeded_handleCropForTransparentActivityBasedOnOpaqueBounds() {

        final InsetsSource taskbar = new InsetsSource(/*id=*/ 0,
@@ -859,6 +899,7 @@ public class LetterboxUiControllerTest extends WindowTestsBase { 
        assertEquals(SCREEN_ORIENTATION_USER, mController.overrideOrientationIfNeeded(

                /* candidate */ SCREEN_ORIENTATION_UNSPECIFIED));

    }



    @Test

    public void testOverrideOrientationIfNeeded_respectOrientationRequestOverUserFullScreen() {

        spyOn(mController);