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

Commit cef2d56f authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of a14a14ab to master"

parents ecda882c 79a64b62

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

+1 −6
Original line number Diff line number Diff line
@@ -525,13 +525,8 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
        // Now make sure the window fits in the overall display.

        Gravity.applyDisplay(mAttrs.gravity, df, mFrame);



        // Make sure the overscan, content and visible frames are inside of the

        // Make sure the content and visible frames are inside of the

        // final window frame.

        mOverscanFrame.set(Math.max(mOverscanFrame.left, mFrame.left),

                Math.max(mOverscanFrame.top, mFrame.top),

                Math.min(mOverscanFrame.right, mFrame.right),

                Math.min(mOverscanFrame.bottom, mFrame.bottom));



        mContentFrame.set(Math.max(mContentFrame.left, mFrame.left),

                Math.max(mContentFrame.top, mFrame.top),

                Math.min(mContentFrame.right, mFrame.right),