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

Commit b4431aaf authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Account for cutouts in system insets (as done previously)" into rvc-qpr-dev am: a03cd95a 

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

Change-Id: Id6c6f022bd57ed103c0f37a9d09eec4a29d84352
parents 7999d971 a03cd95a

core/java/com/android/internal/policy/DecorView.java

+7 −5
Original line number Diff line number Diff line
@@ -1094,13 +1094,15 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
            mLastWindowFlags = attrs.flags;



            if (insets != null) {

                final Insets systemBarInsets = insets.getInsets(WindowInsets.Type.systemBars());

                final Insets stableBarInsets = insets.getInsetsIgnoringVisibility(

                        WindowInsets.Type.systemBars());

                mLastTopInset = systemBarInsets.top;

                mLastBottomInset = systemBarInsets.bottom;

                mLastRightInset = systemBarInsets.right;

                mLastLeftInset = systemBarInsets.left;

                final Insets systemInsets = Insets.min(

                        insets.getInsets(WindowInsets.Type.systemBars()

                                | WindowInsets.Type.displayCutout()), stableBarInsets);

                mLastTopInset = systemInsets.top;

                mLastBottomInset = systemInsets.bottom;

                mLastRightInset = systemInsets.right;

                mLastLeftInset = systemInsets.left;



                // Don't animate if the presence of stable insets has changed, because that

                // indicates that the window was either just added and received them for the