Merge "Remove enabled flag insets_decoupled_configuration" into main (608bfda6) · Commits · e / os / android_frameworks_base

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -11,14 +11,6 @@ flag {
		}
		}

		flag {
		name: "allows_screen_size_decoupled_from_status_bar_and_cutout"
		namespace: "large_screen_experiences_app_compat"
		description: "When necessary, configuration decoupled from status bar and display cutout"
		bug: "291870756"
		is_fixed_read_only: true
		}

		flag {
		name: "movable_cutout_configuration"
		namespace: "large_screen_experiences_app_compat"

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -195,14 +195,6 @@ flag {
		}
		}

		flag {
		name: "insets_decoupled_configuration"
		namespace: "windowing_frontend"
		description: "Configuration decoupled from insets"
		bug: "151861875"
		is_fixed_read_only: true
		}

		flag {
		name: "update_dims_when_window_shown"
		namespace: "windowing_frontend"

core/tests/coretests/src/android/window/WindowMetricsHelperTest.java

+0 −27

Original line number	Diff line number	Diff line
		@@ -22,12 +22,8 @@ import static android.view.WindowInsets.Type.navigationBars;
		import static org.junit.Assert.assertEquals;

		import android.app.Activity;
		import android.graphics.Point;
		import android.graphics.Rect;
		import android.platform.test.annotations.Presubmit;
		import android.platform.test.annotations.RequiresFlagsDisabled;
		import android.platform.test.flag.junit.CheckFlagsRule;
		import android.platform.test.flag.junit.DeviceFlagsValueProvider;
		import android.view.WindowInsets;
		import android.view.WindowMetrics;

		@@ -35,8 +31,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.filters.SmallTest;
		import androidx.test.rule.ActivityTestRule;

		import com.android.window.flags.Flags;

		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		@@ -58,27 +52,6 @@ public class WindowMetricsHelperTest {
		@Rule
		public ActivityTestRule<TestActivity> mActivityRule =
		new ActivityTestRule<>(TestActivity.class);
		@Rule
		public final CheckFlagsRule mCheckFlagsRule =
		DeviceFlagsValueProvider.createCheckFlagsRule();

		@Test
		@RequiresFlagsDisabled(Flags.FLAG_INSETS_DECOUPLED_CONFIGURATION)
		public void testGetBoundsExcludingNavigationBarAndCutoutMatchesDisplayGetSize()
		throws Throwable {
		mActivityRule.runOnUiThread(() -> {
		Activity activity = mActivityRule.getActivity();
		final WindowMetrics metrics = activity.getWindowManager().getCurrentWindowMetrics();
		final Rect boundsExcludingNavBarAndCutout = WindowMetricsHelper
		.getBoundsExcludingNavigationBarAndCutout(metrics);

		final Point expectedSize = new Point();
		activity.getDisplay().getSize(expectedSize);

		assertEquals(expectedSize.x, boundsExcludingNavBarAndCutout.width());
		assertEquals(expectedSize.y, boundsExcludingNavBarAndCutout.height());
		});
		}

		@Test
		public void testGetBoundsExcludingNavigationBarAndCutout()

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

+7 −15

Original line number	Diff line number	Diff line
		@@ -1846,19 +1846,12 @@ final class ActivityRecord extends WindowToken {
		// getOverrideOrientation that requires having mAppCompatController initialised.
		mAppCompatController = new AppCompatController(mWmService, this);
		mResolveConfigHint = new TaskFragment.ConfigOverrideHint();
		if (mWmService.mFlags.mInsetsDecoupledConfiguration) {
		// When the stable configuration is the default behavior, override for the legacy apps
		// without forward override flag.
		mResolveConfigHint.mUseOverrideInsetsForConfig =
		!info.isChangeEnabled(INSETS_DECOUPLED_CONFIGURATION_ENFORCED)
		&& !info.isChangeEnabled(
		OVERRIDE_ENABLE_INSETS_DECOUPLED_CONFIGURATION);
		} else {
		// When the stable configuration is not the default behavior, forward overriding the
		// listed apps.
		mResolveConfigHint.mUseOverrideInsetsForConfig =
		info.isChangeEnabled(OVERRIDE_ENABLE_INSETS_DECOUPLED_CONFIGURATION);
		}

		mTargetSdk = info.applicationInfo.targetSdkVersion;

		@@ -7893,8 +7886,7 @@ final class ActivityRecord extends WindowToken {
		}

		boolean isImmersiveMode(@NonNull Rect parentBounds) {
		if (!mResolveConfigHint.mUseOverrideInsetsForConfig
		&& mWmService.mFlags.mInsetsDecoupledConfiguration) {
		if (!mResolveConfigHint.mUseOverrideInsetsForConfig) {
		return false;
		}
		final Insets navBarInsets = mDisplayContent.getInsetsStateController()

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -220,11 +220,9 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> {
		return;
		}
		final boolean useOverrideInsetsForConfig =
		displayContent.mWmService.mFlags.mInsetsDecoupledConfiguration
		? !appInfo.isChangeEnabled(INSETS_DECOUPLED_CONFIGURATION_ENFORCED)
		!appInfo.isChangeEnabled(INSETS_DECOUPLED_CONFIGURATION_ENFORCED)
		&& !appInfo.isChangeEnabled(
		OVERRIDE_ENABLE_INSETS_DECOUPLED_CONFIGURATION)
		: appInfo.isChangeEnabled(OVERRIDE_ENABLE_INSETS_DECOUPLED_CONFIGURATION);
		OVERRIDE_ENABLE_INSETS_DECOUPLED_CONFIGURATION);
		final int parentWindowingMode =
		newParentConfiguration.windowConfiguration.getWindowingMode();
		final boolean isFloating = isFloating(parentWindowingMode)