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

Commit 656f6506 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix calculation of content insets 

When calculating all the frames and insets, we need to use the actual
frame instead of layoutContainingFrame. To do this, we layout mFrame
with layoutContaining/layoutDisplayFrame, calculate all the content
frames and insets, and then offset everything by the constant offset.

Bug: 28075359
Change-Id: I78f0a54ca2a0cc6c7c8be21153c2b2c8f1d5c0a9
parent b72c9ad7

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

+29 −30
Original line number Original line Diff line number Diff line
@@ -774,10 +774,6 @@ final class WindowState implements WindowManagerPolicy.WindowState { 




        applyGravityAndUpdateFrame(layoutContainingFrame, layoutDisplayFrame);

        applyGravityAndUpdateFrame(layoutContainingFrame, layoutDisplayFrame);





        // Offset the actual frame by the amount layout frame is off.

        mFrame.offset(-layoutXDiff, -layoutYDiff);

        mCompatFrame.offset(-layoutXDiff, -layoutYDiff);



        // Calculate the outsets before the content frame gets shrinked to the window frame.

        // Calculate the outsets before the content frame gets shrinked to the window frame.

        if (hasOutsets) {

        if (hasOutsets) {

            mOutsets.set(Math.max(mContentFrame.left - mOutsetFrame.left, 0),

            mOutsets.set(Math.max(mContentFrame.left - mOutsetFrame.left, 0),
@@ -816,20 +812,20 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
                mMovedByResize = true;

                mMovedByResize = true;

            }

            }

        } else {

        } else {

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

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

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

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

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

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

                    Math.min(mContentFrame.bottom, layoutContainingFrame.bottom));

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





            mVisibleFrame.set(Math.max(mVisibleFrame.left, layoutContainingFrame.left),

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

                    Math.max(mVisibleFrame.top, layoutContainingFrame.top),

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

                    Math.min(mVisibleFrame.right, layoutContainingFrame.right),

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

                    Math.min(mVisibleFrame.bottom, layoutContainingFrame.bottom));

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





            mStableFrame.set(Math.max(mStableFrame.left, layoutContainingFrame.left),

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

                    Math.max(mStableFrame.top, layoutContainingFrame.top),

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

                    Math.min(mStableFrame.right, layoutContainingFrame.right),

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

                    Math.min(mStableFrame.bottom, layoutContainingFrame.bottom));

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

        }

        }





        if (fullscreenTask && !windowsAreFloating) {

        if (fullscreenTask && !windowsAreFloating) {
@@ -857,30 +853,33 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
            getDisplayContent().getLogicalDisplayRect(mTmpRect);

            getDisplayContent().getLogicalDisplayRect(mTmpRect);

            // Override right and/or bottom insets in case if the frame doesn't fit the screen in

            // Override right and/or bottom insets in case if the frame doesn't fit the screen in

            // non-fullscreen mode.

            // non-fullscreen mode.

            boolean overrideRightInset = !fullscreenTask && layoutContainingFrame.right > mTmpRect.right;

            boolean overrideRightInset = !fullscreenTask && mFrame.right > mTmpRect.right;

            boolean overrideBottomInset = !fullscreenTask && layoutContainingFrame.bottom > mTmpRect.bottom;

            boolean overrideBottomInset = !fullscreenTask && mFrame.bottom > mTmpRect.bottom;

            mContentInsets.set(mContentFrame.left - layoutContainingFrame.left,

            mContentInsets.set(mContentFrame.left - mFrame.left,

                    mContentFrame.top - layoutContainingFrame.top,

                    mContentFrame.top - mFrame.top,

                    overrideRightInset ? mTmpRect.right - mContentFrame.right

                    overrideRightInset ? mTmpRect.right - mContentFrame.right

                            : layoutContainingFrame.right - mContentFrame.right,

                            : mFrame.right - mContentFrame.right,

                    overrideBottomInset ? mTmpRect.bottom - mContentFrame.bottom

                    overrideBottomInset ? mTmpRect.bottom - mContentFrame.bottom

                            : layoutContainingFrame.bottom - mContentFrame.bottom);

                            : mFrame.bottom - mContentFrame.bottom);





            mVisibleInsets.set(mVisibleFrame.left - layoutContainingFrame.left,

            mVisibleInsets.set(mVisibleFrame.left - mFrame.left,

                    mVisibleFrame.top - layoutContainingFrame.top,

                    mVisibleFrame.top - mFrame.top,

                    overrideRightInset ? mTmpRect.right - mVisibleFrame.right

                    overrideRightInset ? mTmpRect.right - mVisibleFrame.right

                            : layoutContainingFrame.right - mVisibleFrame.right,

                            : mFrame.right - mVisibleFrame.right,

                    overrideBottomInset ? mTmpRect.bottom - mVisibleFrame.bottom

                    overrideBottomInset ? mTmpRect.bottom - mVisibleFrame.bottom

                            : layoutContainingFrame.bottom - mVisibleFrame.bottom);

                            : mFrame.bottom - mVisibleFrame.bottom);





            mStableInsets.set(Math.max(mStableFrame.left - layoutContainingFrame.left, 0),

            mStableInsets.set(Math.max(mStableFrame.left - mFrame.left, 0),

                    Math.max(mStableFrame.top - layoutContainingFrame.top, 0),

                    Math.max(mStableFrame.top - mFrame.top, 0),

                    overrideRightInset ? Math.max(mTmpRect.right - mStableFrame.right, 0)

                    overrideRightInset ? Math.max(mTmpRect.right - mStableFrame.right, 0)

                            : Math.max(layoutContainingFrame.right - mStableFrame.right, 0),

                            : Math.max(mFrame.right - mStableFrame.right, 0),

                    overrideBottomInset ? Math.max(mTmpRect.bottom - mStableFrame.bottom, 0)

                    overrideBottomInset ? Math.max(mTmpRect.bottom - mStableFrame.bottom, 0)

                            :  Math.max(layoutContainingFrame.bottom - mStableFrame.bottom, 0));

                            :  Math.max(mFrame.bottom - mStableFrame.bottom, 0));

        }

        }





        // Offset the actual frame by the amount layout frame is off.

        mFrame.offset(-layoutXDiff, -layoutYDiff);

        mCompatFrame.offset(-layoutXDiff, -layoutYDiff);

        mContentFrame.offset(-layoutXDiff, -layoutYDiff);

        mContentFrame.offset(-layoutXDiff, -layoutYDiff);

        mVisibleFrame.offset(-layoutXDiff, -layoutYDiff);

        mVisibleFrame.offset(-layoutXDiff, -layoutYDiff);

        mStableFrame.offset(-layoutXDiff, -layoutYDiff);

        mStableFrame.offset(-layoutXDiff, -layoutYDiff);