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

Commit 8a0b5b35 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Update TaskLaunchParamsModifier.java to use DA instead DC" into sc-dev am: b53e07bc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13433950

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia39467d4aa8094b3a4b8b49226e290dd8f92375e
parents ff4c0959 b53e07bc

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

+15 −0
Original line number Diff line number Diff line
@@ -495,6 +495,21 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { 
        return info;

    }



    /**

     * Gets the stable bounds of the DisplayArea, which is the bounds excluding insets for

     * navigation bar, cutout, and status bar.

     */

    void getStableRect(Rect out) {

        if (mDisplayContent == null) {

            getBounds(out);

            return;

        }



        // Intersect with the display stable bounds to get the DisplayArea stable bounds.

        mDisplayContent.getStableRect(out);

        out.intersect(getBounds());

    }



    @Override

    public boolean providesMaxBounds() {

        return true;

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

+1 −0
Original line number Diff line number Diff line
@@ -2677,6 +2677,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        mWmService.mDisplayWindowSettings.setForcedSize(this, width, height);

    }



    @Override

    void getStableRect(Rect out) {

        final InsetsState state = mDisplayContent.getInsetsStateController().getRawInsetsState();

        out.set(state.getDisplayFrame());