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

Commit 3c80d71b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixing incorrect mStable insets being set before user setup is... 

Merge "Fixing incorrect mStable insets being set before user setup is complete" into rvc-dev am: f18b6b64 am: 9f5c1859 am: bc922e71

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

Change-Id: I6c7b390918dfa5edb08a3f413c15ba70fbb1b718
parents 7d21e092 bc922e71

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

+3 −2
Original line number Diff line number Diff line
@@ -1833,10 +1833,11 @@ public class DisplayPolicy { 


        if (navBarPosition == NAV_BAR_BOTTOM) {

            // It's a system nav bar or a portrait screen; nav bar goes on bottom.

            final int top = cutoutSafeUnrestricted.bottom

                    - getNavigationBarHeight(rotation, uiMode);

            final int topNavBar = cutoutSafeUnrestricted.bottom

                    - getNavigationBarFrameHeight(rotation, uiMode);

            final int top = mNavButtonForcedVisible

                    ? topNavBar

                    : cutoutSafeUnrestricted.bottom - getNavigationBarHeight(rotation, uiMode);

            navigationFrame.set(0, topNavBar, displayWidth, displayFrames.mUnrestricted.bottom);

            displayFrames.mStable.bottom = displayFrames.mStableFullscreen.bottom = top;

            if (transientNavBarShowing) {