Merge "Clean up force_show_system_bar_for_bubble" into main (669f519c) · Commits · e / os / android_frameworks_base

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -107,17 +107,6 @@ flag {
		bug: "407149510"
		}

		flag {
		namespace: "windowing_sdk"
		name: "force_show_system_bar_for_bubble"
		description: "Ensure system bar are shown for Bubble"
		bug: "329124127"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "windowing_sdk"
		name: "reparent_to_default_with_display_removal"

+0 −7

Original line number	Diff line number	Diff line
		@@ -2609,9 +2609,6 @@ public class DisplayPolicy {
		}

		private boolean fillsDisplayWindowingMode(@NonNull WindowState win) {
		if (!com.android.window.flags.Flags.forceShowSystemBarForBubble()) {
		return true;
		}
		if (!WindowConfiguration.inMultiWindowMode(win.getWindowingMode())) {
		// Always accept the window not in multi-window mode.
		return true;
		@@ -2660,10 +2657,6 @@ public class DisplayPolicy {
		}
		}
		if (winCandidate == null) {
		if (!com.android.window.flags.Flags.forceShowSystemBarForBubble()) {
		// Before this feature, this method early returns when winCandidate is null.
		return;
		}
		final ActivityRecord focusedApp = mDisplayContent.mFocusedApp;
		if (focusedApp == null \|\| fillsDisplayWindowingMode(focusedApp)) {
		// Don't change the system UI controlling window when the new one is not ready.

+0 −1

Original line number	Diff line number	Diff line
		@@ -156,7 +156,6 @@ public class InsetsPolicyTest extends WindowTestsBase {
		}

		@Test
		@EnableFlags(Flags.FLAG_FORCE_SHOW_SYSTEM_BAR_FOR_BUBBLE)
		public void testControlsForDispatch_nonFullscreenMultiWindowTaskVisible() {
		addStatusBar();
		addNavigationBar();