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

Commit 9b15205c authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "[2/n] Integrate OptPropBuilder in LetterboxUiController" into main

parents a3b836fd 65231dc6

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

+125 −260

File changed.

Preview size limit exceeded, changes collapsed.

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

+5 −4
Original line number Diff line number Diff line
@@ -258,8 +258,8 @@ public final class DisplayRotationCompatPolicyTests extends WindowTestsBase { 
    public void testTreatmentDisabledPerApp_noForceRotationOrRefresh()

            throws Exception {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);

        when(mActivity.mLetterboxUiController.shouldForceRotateForCameraCompat())

                .thenReturn(false);

        doReturn(false).when(mActivity.mLetterboxUiController)

                .shouldForceRotateForCameraCompat();



        mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1);
@@ -459,8 +459,9 @@ public final class DisplayRotationCompatPolicyTests extends WindowTestsBase { 
    public void testOnActivityConfigurationChanging_refreshDisabledViaFlag_noRefresh()

            throws Exception {

        configureActivity(SCREEN_ORIENTATION_PORTRAIT);

        when(mActivity.mLetterboxUiController.shouldRefreshActivityForCameraCompat())

                .thenReturn(false);



        doReturn(false).when(

                mActivity.mLetterboxUiController).shouldRefreshActivityForCameraCompat();



        mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1);

        callOnActivityConfigurationChanging(mActivity, /* isDisplayRotationChanging */ true);