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

Commit e3d243d3 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Update config according to insets of status bar 

Previously, only cutout and navbar are included, so only the change
of decor frame may trigger config change.
But screenWidthDp and screenHeightDp are calculated according to
config (stable) frame, which includes the insets from status bar.

So this change makes the display configuration consistent with the
latest state of the display decor insets.

Fix: 259693044
Test: DisplayPolicyTests#testUpdateDisplayConfigurationByDecor

Change-Id: Idaa7280ed23076b3282c987a249259e0c38b6630
parent f0a411d6

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

+7 −1
Original line number Diff line number Diff line
@@ -1882,6 +1882,12 @@ public class DisplayPolicy { 


        static final int DECOR_TYPES = Type.displayCutout() | Type.navigationBars();



        /**

         * The types that may affect display configuration. This excludes cutout because it is

         * known from display info.

         */

        static final int CONFIG_TYPES = Type.statusBars() | Type.navigationBars();



        private final DisplayContent mDisplayContent;

        private final Info[] mInfoForRotation = new Info[4];

        final Info mTmpInfo = new Info();
@@ -1921,7 +1927,7 @@ public class DisplayPolicy { 
        final DecorInsets.Info newInfo = mDecorInsets.mTmpInfo;

        newInfo.update(mDisplayContent, rotation, dw, dh);

        final DecorInsets.Info currentInfo = getDecorInsetsInfo(rotation, dw, dh);

        if (newInfo.mNonDecorFrame.equals(currentInfo.mNonDecorFrame)) {

        if (newInfo.mConfigFrame.equals(currentInfo.mConfigFrame)) {

            return false;

        }

        mDecorInsets.invalidate();

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

+2 −2
Original line number Diff line number Diff line
@@ -1831,7 +1831,7 @@ public class WindowManagerService extends IWindowManager.Stub 


            boolean needToSendNewConfiguration =

                    win.isVisibleRequestedOrAdding() && displayContent.updateOrientation();

            if (win.providesNonDecorInsets()) {

            if (win.providesDisplayDecorInsets()) {

                needToSendNewConfiguration |= displayPolicy.updateDecorInsetsInfo();

            }

            if (needToSendNewConfiguration) {
@@ -2274,7 +2274,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                        & WindowManager.LayoutParams.SYSTEM_UI_VISIBILITY_CHANGED) != 0) {

                    win.mLayoutNeeded = true;

                }

                if (layoutChanged && win.providesNonDecorInsets()) {

                if (layoutChanged && win.providesDisplayDecorInsets()) {

                    configChanged = displayPolicy.updateDecorInsetsInfo();

                }

                if (win.mActivityRecord != null && ((flagChanges & FLAG_SHOW_WHEN_LOCKED) != 0

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

+4 −4
Original line number Diff line number Diff line
@@ -1834,13 +1834,13 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        return (mPolicyVisibility & POLICY_VISIBILITY_ALL) == POLICY_VISIBILITY_ALL;

    }



    boolean providesNonDecorInsets() {

    boolean providesDisplayDecorInsets() {

        if (mInsetsSourceProviders == null) {

            return false;

        }

        for (int i = mInsetsSourceProviders.size() - 1; i >= 0; i--) {

            final InsetsSource source = mInsetsSourceProviders.valueAt(i).getSource();

            if (source.getType() == WindowInsets.Type.navigationBars()) {

            if ((source.getType() & DisplayPolicy.DecorInsets.CONFIG_TYPES) != 0) {

                return true;

            }

        }
@@ -2507,13 +2507,13 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            }



            // Check if window provides non decor insets before clearing its provided insets.

            final boolean windowProvidesNonDecorInsets = providesNonDecorInsets();

            final boolean windowProvidesDisplayDecorInsets = providesDisplayDecorInsets();



            removeImmediately();

            // Removing a visible window may affect the display orientation so just update it if

            // needed. Also recompute configuration if it provides screen decor insets.

            boolean needToSendNewConfiguration = wasVisible && displayContent.updateOrientation();

            if (windowProvidesNonDecorInsets) {

            if (windowProvidesDisplayDecorInsets) {

                needToSendNewConfiguration |=

                        displayContent.getDisplayPolicy().updateDecorInsetsInfo();

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -3124,7 +3124,7 @@ public class ActivityRecordTests extends WindowTestsBase { 
                .setSystemDecorations(true).build();

        // Add a decor insets provider window.

        final WindowState navbar = createNavBarWithProvidedInsets(squareDisplay);

        assertTrue(navbar.providesNonDecorInsets()

        assertTrue(navbar.providesDisplayDecorInsets()

                && squareDisplay.getDisplayPolicy().updateDecorInsetsInfo());

        squareDisplay.sendNewConfiguration();

        final Task task = new TaskBuilder(mSupervisor).setDisplay(squareDisplay).build();

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

+11 −2
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ import static org.junit.Assert.assertNotEquals; 
import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;
@@ -298,20 +300,27 @@ public class DisplayPolicyTests extends WindowTestsBase { 


    @Test

    public void testUpdateDisplayConfigurationByDecor() {

        doReturn(NO_CUTOUT).when(mDisplayContent).calculateDisplayCutoutForRotation(anyInt());

        final WindowState navbar = createNavBarWithProvidedInsets(mDisplayContent);

        final DisplayPolicy displayPolicy = mDisplayContent.getDisplayPolicy();

        final DisplayInfo di = mDisplayContent.getDisplayInfo();

        final int prevScreenHeightDp = mDisplayContent.getConfiguration().screenHeightDp;

        assertTrue(navbar.providesNonDecorInsets() && displayPolicy.updateDecorInsetsInfo());

        assertTrue(navbar.providesDisplayDecorInsets() && displayPolicy.updateDecorInsetsInfo());

        assertEquals(NAV_BAR_HEIGHT, displayPolicy.getDecorInsetsInfo(di.rotation,

                di.logicalWidth, di.logicalHeight).mConfigInsets.bottom);

        mDisplayContent.sendNewConfiguration();

        assertNotEquals(prevScreenHeightDp, mDisplayContent.getConfiguration().screenHeightDp);

        assertFalse(navbar.providesNonDecorInsets() && displayPolicy.updateDecorInsetsInfo());

        assertFalse(navbar.providesDisplayDecorInsets() && displayPolicy.updateDecorInsetsInfo());



        navbar.removeIfPossible();

        assertEquals(0, displayPolicy.getDecorInsetsInfo(di.rotation, di.logicalWidth,

                di.logicalHeight).mNonDecorInsets.bottom);



        final WindowState statusBar = createStatusBarWithProvidedInsets(mDisplayContent);

        assertTrue(statusBar.providesDisplayDecorInsets()

                && displayPolicy.updateDecorInsetsInfo());

        assertEquals(STATUS_BAR_HEIGHT, displayPolicy.getDecorInsetsInfo(di.rotation,

                di.logicalWidth, di.logicalHeight).mConfigInsets.top);

    }



    @SetupWindows(addWindows = { W_NAVIGATION_BAR, W_INPUT_METHOD })