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

Commit 4a914a40 authored by Yunfan Chen's avatar Yunfan Chen
Browse files

No hard-coded insets type in config calculation 

There's still one place remaining using the hard-coded insets type
status bar to calculate insets for configuration calculation. It causes
the decouple related config not always working as expected. Replace it
with the configTypes to make sure it matches all flags in the system.

Without the change, after any configuration change, or display metrics
change, the status bar may be unexpectedly involved in calculation.
Then status bar will not be decoupled onward, regardless of the config
values.

Bug: 291870756
Test: dump window all and check activity level configuration
Test: Check portrait only app with corresponding build target
Test: DisplayPolicyTests DisplayPolicyInsetsTests
Change-Id: Ie357eb4e8cae261bc0239b6addd54b008251a3b9
parent bb95bb3e

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

+5 −8
Original line number Diff line number Diff line
@@ -1877,15 +1877,12 @@ public class DisplayPolicy { 
                final InsetsState insetsState = df.mInsetsState;

                final Rect displayFrame = insetsState.getDisplayFrame();

                final Insets decor = insetsState.calculateInsets(displayFrame,

                        dc.mWmService.mDecorTypes,

                        true /* ignoreVisibility */);

                final Insets statusBar = insetsState.calculateInsets(displayFrame,

                        Type.statusBars(), true /* ignoreVisibility */);

                        dc.mWmService.mDecorTypes, true /* ignoreVisibility */);

                final Insets configInsets = insetsState.calculateInsets(displayFrame,

                        dc.mWmService.mConfigTypes, true /* ignoreVisibility */);

                mNonDecorInsets.set(decor.left, decor.top, decor.right, decor.bottom);

                mConfigInsets.set(Math.max(statusBar.left, decor.left),

                        Math.max(statusBar.top, decor.top),

                        Math.max(statusBar.right, decor.right),

                        Math.max(statusBar.bottom, decor.bottom));

                mConfigInsets.set(configInsets.left, configInsets.top, configInsets.right,

                        configInsets.bottom);

                mNonDecorFrame.set(displayFrame);

                mNonDecorFrame.inset(mNonDecorInsets);

                mConfigFrame.set(displayFrame);

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

+2 −1
Original line number Diff line number Diff line
@@ -1196,7 +1196,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                && mFlags.mAllowsScreenSizeDecoupledFromStatusBarAndCutout;

        if (!isScreenSizeDecoupledFromStatusBarAndCutout) {

            mDecorTypes = WindowInsets.Type.displayCutout() | WindowInsets.Type.navigationBars();

            mConfigTypes = WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars();

            mConfigTypes = WindowInsets.Type.displayCutout() | WindowInsets.Type.statusBars()

                    | WindowInsets.Type.navigationBars();

        } else {

            mDecorTypes = WindowInsets.Type.navigationBars();

            mConfigTypes = WindowInsets.Type.navigationBars();