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

Commit 996cd4ac authored by Tiger Huang's avatar Tiger Huang
Browse files

Clean up force_show_system_bar_for_bubble 

This CL cleans up the feature flag of force_show_system_bar_for_bubble
since it has been enabled since the target release (25Q3).

Bug: 329124127
Fix: 429949000
Flag: EXEMPT clean up
Test: presubmit
Change-Id: I109cdd412f0d2f93f45dd94b6ed42c507b6fd992
parent 34121fc5

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"

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

+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.

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

+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();