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

Commit 1a8d7b72 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Generalize window bounds for layout" into sc-v2-dev am: cde7b47a am: df0f9a76 

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

Change-Id: Iadc7b630bb0817c217eec186e947ec76da7ff856
parents 46ad952b df0f9a76

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1686,7 +1686,7 @@ public class DisplayPolicy { 
            // frame set for the simulated layout for this case.

            // frame set for the simulated layout for this case.

            computeWindowBounds(attrs, state, df, df);

            computeWindowBounds(attrs, state, df, df);

        } else {

        } else {

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

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

        }

        }

        if (attached == null) {

        if (attached == null) {

            pf.set(df);

            pf.set(df);

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

+0 −10
Original line number Original line Diff line number Diff line
@@ -1443,16 +1443,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        }

        }

    }

    }





    // TODO: Look into whether this override is still necessary.

    @Override

    public Rect getBounds() {

        if (mActivityRecord != null) {

            return mActivityRecord.getBounds();

        } else {

            return super.getBounds();

        }

    }



    /** Retrieves the current frame of the window that the application sees. */

    /** Retrieves the current frame of the window that the application sees. */

    Rect getFrame() {

    Rect getFrame() {

        return mWindowFrames.mFrame;

        return mWindowFrames.mFrame;

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -590,7 +590,9 @@ public class DisplayContentTests extends WindowTestsBase { 
        dc.setImeLayeringTarget(ws);

        dc.setImeLayeringTarget(ws);





        // Adjust bounds so that matchesRootDisplayAreaBounds() returns false.

        // Adjust bounds so that matchesRootDisplayAreaBounds() returns false.

        ws.mActivityRecord.getConfiguration().windowConfiguration.setBounds(new Rect(1, 1, 1, 1));

        final Rect bounds = new Rect(dc.getBounds());

        bounds.scale(0.5f);

        ws.mActivityRecord.setBounds(bounds);

        assertFalse("matchesRootDisplayAreaBounds() should return false",

        assertFalse("matchesRootDisplayAreaBounds() should return false",

                ws.matchesDisplayAreaBounds());

                ws.matchesDisplayAreaBounds());