Merge "Decouple the insets from configuration" into 24D1-dev (792be90c) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -48,5 +48,7 @@ class WindowManagerFlags {
		final boolean mAllowsScreenSizeDecoupledFromStatusBarAndCutout =
		Flags.allowsScreenSizeDecoupledFromStatusBarAndCutout();

		final boolean mInsetsDecoupledConfiguration = Flags.insetsDecoupledConfiguration();

		/* End Available Flags */
		}

+7 −4

Original line number	Diff line number	Diff line
		@@ -1192,13 +1192,16 @@ public class WindowManagerService extends IWindowManager.Stub
		final boolean isScreenSizeDecoupledFromStatusBarAndCutout = context.getResources()
		.getBoolean(R.bool.config_decoupleStatusBarAndDisplayCutoutFromScreenSize)
		&& mFlags.mAllowsScreenSizeDecoupledFromStatusBarAndCutout;
		if (!isScreenSizeDecoupledFromStatusBarAndCutout) {
		if (mFlags.mInsetsDecoupledConfiguration) {
		mDecorTypes = 0;
		mConfigTypes = 0;
		} else if (isScreenSizeDecoupledFromStatusBarAndCutout) {
		mDecorTypes = WindowInsets.Type.navigationBars();
		mConfigTypes = WindowInsets.Type.navigationBars();
		} else {
		mDecorTypes = WindowInsets.Type.displayCutout() \| WindowInsets.Type.navigationBars();
		mConfigTypes = WindowInsets.Type.displayCutout() \| WindowInsets.Type.statusBars()
		\| WindowInsets.Type.navigationBars();
		} else {
		mDecorTypes = WindowInsets.Type.navigationBars();
		mConfigTypes = WindowInsets.Type.navigationBars();
		}
		if (isScreenSizeDecoupledFromStatusBarAndCutout) {
		// Do not fallback to legacy value for enabled devices.