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

Commit eb032a1f authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Move win.skipLayout into policy.layoutWindowLw"

parents 2cd5bd7c 6f682481

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

+2 −2
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    };



    private final Consumer<WindowState> mPerformLayout = w -> {

        if (w.mLayoutAttached || w.skipLayout()) {

        if (w.mLayoutAttached) {

            return;

        }
@@ -866,7 +866,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    };



    private final Consumer<WindowState> mPerformLayoutAttached = w -> {

        if (!w.mLayoutAttached || w.skipLayout()) {

        if (!w.mLayoutAttached) {

            return;

        }

        if (DEBUG_LAYOUT) Slog.v(TAG, "2ND PASS " + w + " mHaveFrame=" + w.mHaveFrame

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

+3 −0
Original line number Diff line number Diff line
@@ -1494,6 +1494,9 @@ public class DisplayPolicy { 
     * @param displayFrames The display frames.

     */

    public void layoutWindowLw(WindowState win, WindowState attached, DisplayFrames displayFrames) {

        if (win.skipLayout()) {

            return;

        }



        // This window might be in the simulated environment.

        // We invoke this to get the proper DisplayFrames.