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

Commit 58130b4e authored by Tiger Huang's avatar Tiger Huang
Browse files

Use the bounds of WindowToken to compute window bounds 

Previously, we use InsetsState#getDisplayFrame as the initial bounds in
computeWindowBounds. However, the frame cannot be moved by the display
area policy. This CL uses the bounds of WindowToken which can be
affected by the display area policy.

Fix: 172451212
Test: Enter one-handed mode and see if ScreenDecorOverlays are laid out
      as expected.
Change-Id: I27328f76591b805223a5b7d3e2cf14b40185816d
parent 915c8155

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

+6 −7
Original line number Diff line number Diff line
@@ -1451,7 +1451,7 @@ public class DisplayPolicy { 
                : (task != null ? task.getBounds() : null);

        final InsetsState state =

                mDisplayContent.getInsetsPolicy().getInsetsForWindowMetrics(attrs);

        computeWindowBounds(attrs, state, outFrame);

        computeWindowBounds(attrs, state, windowToken, outFrame);

        if (taskBounds != null) {

            outFrame.intersect(taskBounds);

        }
@@ -1783,11 +1783,11 @@ public class DisplayPolicy { 
    }



    private void computeWindowBounds(WindowManager.LayoutParams attrs, InsetsState state,

            Rect outBounds) {

            @Nullable WindowToken windowToken, Rect outBounds) {

        final @InsetsType int typesToFit = attrs.getFitInsetsTypes();

        final @InsetsSide int sidesToFit = attrs.getFitInsetsSides();

        final ArraySet<Integer> types = InsetsState.toInternalType(typesToFit);

        final Rect dfu = state.getDisplayFrame();

        final Rect df = windowToken != null ? windowToken.getBounds() : state.getDisplayFrame();

        Insets insets = Insets.of(0, 0, 0, 0);

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

            final InsetsSource source = state.peekSource(types.valueAt(i));
@@ -1795,13 +1795,13 @@ public class DisplayPolicy { 
                continue;

            }

            insets = Insets.max(insets, source.calculateInsets(

                    dfu, attrs.isFitInsetsIgnoringVisibility()));

                    df, attrs.isFitInsetsIgnoringVisibility()));

        }

        final int left = (sidesToFit & Side.LEFT) != 0 ? insets.left : 0;

        final int top = (sidesToFit & Side.TOP) != 0 ? insets.top : 0;

        final int right = (sidesToFit & Side.RIGHT) != 0 ? insets.right : 0;

        final int bottom = (sidesToFit & Side.BOTTOM) != 0 ? insets.bottom : 0;

        outBounds.set(dfu.left + left, dfu.top + top, dfu.right - right, dfu.bottom - bottom);

        outBounds.set(df.left + left, df.top + top, df.right - right, df.bottom - bottom);

    }



    /**
@@ -1842,7 +1842,7 @@ public class DisplayPolicy { 
        final boolean layoutInsetDecor = (fl & FLAG_LAYOUT_INSET_DECOR) == FLAG_LAYOUT_INSET_DECOR;



        final InsetsState state = win.getInsetsState();

        computeWindowBounds(attrs, state, df);

        computeWindowBounds(attrs, state, win.mToken, df);

        if (attached == null) {

            pf.set(df);

            if ((pfl & PRIVATE_FLAG_INSET_PARENT_FRAME_BY_IME) != 0) {
@@ -1915,7 +1915,6 @@ public class DisplayPolicy { 
            // They will later be cropped or shifted using the displayFrame in WindowState,

            // which prevents overlap with the DisplayCutout.

            if (!attachedInParent && !floatingInScreenWindow) {

                getRotatedWindowBounds(displayFrames, win, sTmpRect);

                sTmpRect.set(pf);

                pf.intersectUnchecked(displayCutoutSafeExceptMaybeBars);

                windowFrames.setParentFrameWasClippedByDisplayCutout(!sTmpRect.equals(pf));