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

Commit d20776ce authored by Graciela Wissen Putri's avatar Graciela Wissen Putri
Browse files

Clean up immersive bug fix flag 

Flag: EXEMPT removing com.android.window.flags.immersive_app_repositioning
Bug: 375291719
Test: atest SizeCompatTests
Change-Id: I0e0442f411ba4633d8c8741630bc0631d73e5820
parent 68fe97e6

core/java/android/window/flags/large_screen_experiences_app_compat.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -79,16 +79,6 @@ flag { 
  is_fixed_read_only: true

}



flag {

  name: "immersive_app_repositioning"

  namespace: "large_screen_experiences_app_compat"

  description: "Fix immersive apps changing size when repositioning"

  bug: "334076352"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "camera_compat_for_freeform"

  namespace: "large_screen_experiences_app_compat"

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

+1 −17
Original line number Diff line number Diff line
@@ -8507,8 +8507,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // If activity in fullscreen mode is letterboxed because of fixed orientation then bounds

        // are already calculated in resolveFixedOrientationConfiguration.

        // Don't apply aspect ratio if app is overridden to fullscreen by device user/manufacturer.

        if (Flags.immersiveAppRepositioning()

                && !mAppCompatController.getAppCompatAspectRatioPolicy()

        if (!mAppCompatController.getAppCompatAspectRatioPolicy()

                    .isLetterboxedForFixedOrientationAndAspectRatio()

                && !mAppCompatController.getAppCompatAspectRatioOverrides()

                    .hasFullscreenOverride()) {
@@ -8530,18 +8529,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                computeConfigByResolveHint(resolvedConfig, newParentConfiguration);

            }

        }

        // If activity in fullscreen mode is letterboxed because of fixed orientation then bounds

        // are already calculated in resolveFixedOrientationConfiguration, or if in size compat

        // mode, it should already be calculated in resolveSizeCompatModeConfiguration.

        // Don't apply aspect ratio if app is overridden to fullscreen by device user/manufacturer.

        if (!Flags.immersiveAppRepositioning()

                && !mAppCompatController.getAppCompatAspectRatioPolicy()

                    .isLetterboxedForFixedOrientationAndAspectRatio()

                && !scmPolicy.isInSizeCompatModeForBounds()

                && !mAppCompatController.getAppCompatAspectRatioOverrides()

                    .hasFullscreenOverride()) {

            resolveAspectRatioRestriction(newParentConfiguration);

        }



        if (isFixedOrientationLetterboxAllowed

                || scmPolicy.hasAppCompatDisplayInsetsWithoutInheritance()
@@ -8798,9 +8785,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
    }



    boolean isImmersiveMode(@NonNull Rect parentBounds) {

        if (!Flags.immersiveAppRepositioning()) {

            return false;

        }

        if (!mResolveConfigHint.mUseOverrideInsetsForConfig

                && mWmService.mFlags.mInsetsDecoupledConfiguration) {

            return false;

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

+1 −5
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ import android.content.pm.ActivityInfo; 
import android.content.res.Configuration;

import android.graphics.Rect;



import com.android.window.flags.Flags;



import java.io.PrintWriter;

import java.util.function.DoubleSupplier;
@@ -202,9 +200,7 @@ class AppCompatSizeCompatModePolicy { 
        // saved here before resolved bounds are overridden below.

        final AppCompatAspectRatioPolicy aspectRatioPolicy = mActivityRecord.mAppCompatController

                .getAppCompatAspectRatioPolicy();

        final boolean useResolvedBounds = Flags.immersiveAppRepositioning()

                ? aspectRatioPolicy.isAspectRatioApplied()

                : aspectRatioPolicy.isLetterboxedForFixedOrientationAndAspectRatio();

        final boolean useResolvedBounds = aspectRatioPolicy.isAspectRatioApplied();

        final Rect containerBounds = useResolvedBounds

                ? new Rect(resolvedBounds)

                : newParentConfiguration.windowConfiguration.getBounds();

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

+0 −2
Original line number Diff line number Diff line
@@ -358,7 +358,6 @@ public class SizeCompatTests extends WindowTestsBase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_IMMERSIVE_APP_REPOSITIONING)

    @DisableCompatChanges({ActivityInfo.INSETS_DECOUPLED_CONFIGURATION_ENFORCED})

    public void testRepositionLandscapeImmersiveAppWithDisplayCutout() {

        final int dw = 2100;
@@ -3781,7 +3780,6 @@ public class SizeCompatTests extends WindowTestsBase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_IMMERSIVE_APP_REPOSITIONING)

    public void testImmersiveLetterboxAlignedToBottom_OverlappingNavbar() {

        assertLandscapeActivityAlignedToBottomWithNavbar(true /* immersive */);

    }